From: tip-bot for David Howells <dhowells@redhat.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, arve@android.com, hpa@zytor.com,
mingo@redhat.com, dhowells@redhat.com, ralf@linux-mips.org,
tglx@linutronix.de, sfr@canb.auug.org.au, mingo@elte.hu
Subject: [tip:core/types] fs: Remove missed -> fds_bits from cessation use of fd_set structs internally
Date: Fri, 24 Feb 2012 05:15:06 -0800 [thread overview]
Message-ID: <tip-189017c25c8497760c89646c06297c37d6cde072@git.kernel.org> (raw)
In-Reply-To: <20120224105707.32170.11550.stgit@warthog.procyon.org.uk>
Commit-ID: 189017c25c8497760c89646c06297c37d6cde072
Gitweb: http://git.kernel.org/tip/189017c25c8497760c89646c06297c37d6cde072
Author: David Howells <dhowells@redhat.com>
AuthorDate: Fri, 24 Feb 2012 10:57:07 +0000
Committer: Ingo Molnar <mingo@elte.hu>
CommitDate: Fri, 24 Feb 2012 14:04:50 +0100
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:
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 <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>
---
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 35dd9c3..9446f01 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
prev parent reply other threads:[~2012-02-24 13:16 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-24 10:57 [PATCH] Remove missed ->fds_bits " David Howells
2012-02-24 13:15 ` tip-bot for David Howells [this message]
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=tip-189017c25c8497760c89646c06297c37d6cde072@git.kernel.org \
--to=dhowells@redhat.com \
--cc=arve@android.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=mingo@redhat.com \
--cc=ralf@linux-mips.org \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
/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®