diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 15:10:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 15:10:52 -0700 |
| commit | a4531edd75522804dd2b268d8ccc5eaa70748011 (patch) | |
| tree | 79d75a2f0e21c8f97e6a8ac25104bd726f48a9a8 | |
| parent | 1d8674edb534a3c5cb549bfde5a39fa5598cb3bc (diff) | |
| download | linux-3.10-a4531edd75522804dd2b268d8ccc5eaa70748011.tar.gz linux-3.10-a4531edd75522804dd2b268d8ccc5eaa70748011.tar.bz2 linux-3.10-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>
| -rw-r--r-- | fs/compat.c | 4 |
1 files changed, 3 insertions, 1 deletions
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; |