From: David Howells <dhowells@redhat.com>
To: hpa@zytor.com
Cc: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org,
"David Howells" <dhowells@redhat.com>,
"Ralf Bächle" <ralf@linux-mips.org>,
"Arve Hjønnevåg" <arve@android.com>
Subject: [PATCH] Remove missed ->fds_bits from cessation use of fd_set structs internally
Date: Fri, 24 Feb 2012 10:57:07 +0000 [thread overview]
Message-ID: <20120224105707.32170.11550.stgit@warthog.procyon.org.uk> (raw)
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 <ralf@linux-mips.org>
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
next reply other threads:[~2012-02-24 11:08 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-24 10:57 David Howells [this message]
2012-02-24 13:15 ` [tip:core/types] fs: Remove missed -> fds_bits " tip-bot for David Howells
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120224105707.32170.11550.stgit@warthog.procyon.org.uk \
--to=dhowells@redhat.com \
--cc=arve@android.com \
--cc=hpa@zytor.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ralf@linux-mips.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®