fs: add kern_select() helper; remove in-kernel call to sys_select()

[linux-2.6-block.git] / fs / select.c

diff --git a/fs/select.c b/fs/select.c
index b6c36254028ad1f48c5edc79186c52882caf61d1..b5df01c4587d54a787398beffeb3ae1191341b32 100644 (file)
--- a/fs/select.c
+++ b/fs/select.c
@@ -675,8 +675,8 @@ out_nofds:
        return ret;
 }
 
-SYSCALL_DEFINE5(select, int, n, fd_set __user *, inp, fd_set __user *, outp,
-               fd_set __user *, exp, struct timeval __user *, tvp)
+static int kern_select(int n, fd_set __user *inp, fd_set __user *outp,
+                      fd_set __user *exp, struct timeval __user *tvp)
 {
        struct timespec64 end_time, *to = NULL;
        struct timeval tv;
@@ -699,6 +699,12 @@ SYSCALL_DEFINE5(select, int, n, fd_set __user *, inp, fd_set __user *, outp,
        return ret;
 }
 
+SYSCALL_DEFINE5(select, int, n, fd_set __user *, inp, fd_set __user *, outp,
+               fd_set __user *, exp, struct timeval __user *, tvp)
+{
+       return kern_select(n, inp, outp, exp, tvp);
+}
+
 static long do_pselect(int n, fd_set __user *inp, fd_set __user *outp,
                       fd_set __user *exp, struct timespec __user *tsp,
                       const sigset_t __user *sigmask, size_t sigsetsize)
@@ -784,7 +790,7 @@ SYSCALL_DEFINE1(old_select, struct sel_arg_struct __user *, arg)
 
        if (copy_from_user(&a, arg, sizeof(a)))
                return -EFAULT;
-       return sys_select(a.n, a.inp, a.outp, a.exp, a.tvp);
+       return kern_select(a.n, a.inp, a.outp, a.exp, a.tvp);
 }
 #endif