From 189017c25c8497760c89646c06297c37d6cde072 Mon Sep 17 00:00:00 2001 From: David Howells Date: Fri, 24 Feb 2012 10:57:07 +0000 Subject: [PATCH] fs: Remove missed ->fds_bits from cessation use of fd_set structs internally MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Stephen Rothwell reported that the following commit broke the linux-next build: 1fd36adcd98c: Replace the fd_sets in struct fdtable with an array of unsigned longs Fix places where ->fds_bits needed to be removed as the core kernel no longer uses fd_set internally for file descriptor table management. There are two places: (1) drivers/staging/android/binder.c (2) arch/mips/kernel/kspd.c Question: Should sp_cleanup() in the MIPS arch be using find_next_bit() or fls()? Reported-by: Stephen Rothwell Signed-off-by: David Howells cc: Ralf Bächle cc: Arve Hjønnevåg Link: http://lkml.kernel.org/r/20120224105707.32170.11550.stgit@warthog.procyon.org.uk Signed-off-by: Ingo Molnar --- arch/mips/kernel/kspd.c | 2 +- drivers/staging/android/binder.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/mips/kernel/kspd.c b/arch/mips/kernel/kspd.c index 29811f04339..84d0639e458 100644 --- a/arch/mips/kernel/kspd.c +++ b/arch/mips/kernel/kspd.c @@ -326,7 +326,7 @@ static void sp_cleanup(void) i = j * __NFDBITS; if (i >= fdt->max_fds) break; - set = fdt->open_fds->fds_bits[j++]; + set = fdt->open_fds[j++]; while (set) { if (set & 1) { struct file * file = xchg(&fdt->fd[i], NULL); diff --git a/drivers/staging/android/binder.c b/drivers/staging/android/binder.c index 35dd9c370e5..9446f0185f5 100644 --- a/drivers/staging/android/binder.c +++ b/drivers/staging/android/binder.c @@ -379,8 +379,7 @@ int task_get_unused_fd_flags(struct binder_proc *proc, int flags) repeat: fdt = files_fdtable(files); - fd = find_next_zero_bit(fdt->open_fds->fds_bits, fdt->max_fds, - files->next_fd); + fd = find_next_zero_bit(fdt->open_fds, fdt->max_fds, files->next_fd); /* * N.B. For clone tasks sharing a files structure, this test -- 2.39.5