From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri, 9 Sep 2005 22:10:52 +0000 (-0700)
Subject: Fix up lost patch in compat_sys_select() for new RCU files world order
X-Git-Tag: v2.6.14-rc1~261
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a4531edd75522804dd2b268d8ccc5eaa70748011;p=linux-2.6-omap-h63xx.git

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>
---

diff --git a/fs/compat.c b/fs/compat.c
index 8c665705c6a..c2e0813164b 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;