summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-09-10 00:10:52 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-10 00:10:52 +0200
commita4531edd75522804dd2b268d8ccc5eaa70748011 (patch)
tree79d75a2f0e21c8f97e6a8ac25104bd726f48a9a8 /fs
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff)
downloadlinux-a4531edd75522804dd2b268d8ccc5eaa70748011.tar.xz
linux-a4531edd75522804dd2b268d8ccc5eaa70748011.zip
Fix up lost patch in compat_sys_select() for new RCU files world order
Andrew lost this in patch reject resolution, and never noticed, since the compat code isn't in use on x86. Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/compat.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/compat.c b/fs/compat.c
index 8c665705c6a0..c2e0813164b4 100644
--- a/fs/compat.c
+++ b/fs/compat.c
@@ -1619,6 +1619,7 @@ compat_sys_select(int n, compat_ulong_t __user *inp, compat_ulong_t __user *outp
char *bits;
long timeout;
int size, max_fdset, ret = -EINVAL;
+ struct fdtable *fdt;
timeout = MAX_SCHEDULE_TIMEOUT;
if (tvp) {
@@ -1644,7 +1645,8 @@ compat_sys_select(int n, compat_ulong_t __user *inp, compat_ulong_t __user *outp
goto out_nofds;
/* max_fdset can increase, so grab it once to avoid race */
- max_fdset = current->files->max_fdset;
+ fdt = files_fdtable(current->files);
+ max_fdset = fdt->max_fdset;
if (n > max_fdset)
n = max_fdset;