Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix up lost patch in compat_sys_select() for new RCU files world order

Browse source 
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>
This commit is contained in:
Linus Torvalds 2005-09-09 15:10:52 -07:00
parent 1d8674edb5
commit a4531edd75
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fs/compat.c
View file

@ -1619,6 +1619,7 @@ compat_sys_select(int n, compat_ulong_t __user *inp, compat_ulong_t __user *outp
char *bits; char *bits;
long timeout; long timeout;
int size, max_fdset, ret = -EINVAL; int size, max_fdset, ret = -EINVAL;
struct fdtable *fdt;
timeout = MAX_SCHEDULE_TIMEOUT; timeout = MAX_SCHEDULE_TIMEOUT;
if (tvp) { if (tvp) {
@ -1644,7 +1645,8 @@ compat_sys_select(int n, compat_ulong_t __user *inp, compat_ulong_t __user *outp
goto out_nofds; goto out_nofds;
/* max_fdset can increase, so grab it once to avoid race */ /* 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) if (n > max_fdset)
n = max_fdset; n = max_fdset;