Commit 189017c2 authored Feb 24, 2012 by David Howells Committed by Ingo Molnar Feb 24, 2012

fs: Remove missed ->fds_bits from cessation use of fd_set structs internally



Stephen Rothwell reported that the following commit broke the
linux-next build:

  1fd36adc: 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 <sfr@canb.auug.org.au>
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Ralf Bächle <ralf@linux-mips.org>
cc: Arve Hjønnevåg <arve@android.com>
Link: http://lkml.kernel.org/r/20120224105707.32170.11550.stgit@warthog.procyon.org.uk


Signed-off-by: Ingo Molnar <mingo@elte.hu>

parent f044db4c

arch/mips/kernel/kspd.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);

drivers/staging/android/binder.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -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

Admin message