From d05798367b798ffa60583fc3b47dcbaf1e3a9230 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Fri, 9 Sep 2005 15:10:52 -0700 Subject: [PATCH] --- yaml --- r: 8288 b: refs/heads/master c: a4531edd75522804dd2b268d8ccc5eaa70748011 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/compat.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9f6f2e2041a4..1426179715d5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1d8674edb534a3c5cb549bfde5a39fa5598cb3bc +refs/heads/master: a4531edd75522804dd2b268d8ccc5eaa70748011 diff --git a/trunk/fs/compat.c b/trunk/fs/compat.c index 8c665705c6a0..c2e0813164b4 100644 --- a/trunk/fs/compat.c +++ b/trunk/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;