tree 79d75a2f0e21c8f97e6a8ac25104bd726f48a9a8
parent 1d8674edb534a3c5cb549bfde5a39fa5598cb3bc
author Linus Torvalds <[EMAIL PROTECTED]> Sat, 10 Sep 2005 05:10:52 -0700
committer Linus Torvalds <[EMAIL PROTECTED]> Sat, 10 Sep 2005 05:10:52 -0700

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 <[EMAIL PROTECTED]>

 fs/compat.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/fs/compat.c b/fs/compat.c
--- a/fs/compat.c
+++ b/fs/compat.c
@@ -1619,6 +1619,7 @@ compat_sys_select(int n, compat_ulong_t 
        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 
                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;
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to