[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20120224105707.32170.11550.stgit@warthog.procyon.org.uk>
Date: Fri, 24 Feb 2012 10:57:07 +0000
From: David Howells <dhowells@...hat.com>
To: hpa@...or.com
Cc: linux-kernel@...r.kernel.org, linux-arch@...r.kernel.org,
David Howells <dhowells@...hat.com>,
Ralf Bächle <ralf@...ux-mips.org>,
Arve Hjønnevåg <arve@...roid.com>
Subject: [PATCH] Remove missed ->fds_bits from cessation use of fd_set structs
internally
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@...hat.com>
cc: Ralf Bächle <ralf@...ux-mips.org>
cc: Arve Hjønnevåg <arve@...roid.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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists