[PATCH] Remove missed ->fds_bits from cessation use of fd_set structs internally
STALE5336d
From: David Howells <dhowells@redhat.com>
Date: 2012-02-24 11:08:02
Also in:
lkml
Subsystem:
mips, staging subsystem, the rest · Maintainers:
Thomas Bogendoerfer, Greg Kroah-Hartman, Linus Torvalds
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()?
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Ralf Bächle <redacted>
cc: Arve Hjønnevåg <arve@android.com>
---
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 29811f0..84d0639 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 347bd6e..eeaa9b8 100644
--- a/drivers/staging/android/binder.c
+++ b/drivers/staging/android/binder.c@@ -380,8 +380,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