Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee13...

[sfrench/cifs-2.6.git] / fs / select.c

diff --git a/fs/select.c b/fs/select.c
index 9c4f0f2604f1e3435679bd0d55499979321edf7c..dcbc1112b7ec214c063eaf5786bb17d5f208e6b0 100644 (file)
--- a/fs/select.c
+++ b/fs/select.c
@@ -658,8 +658,6 @@ int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds, s64 *timeout)
        unsigned int i;
        struct poll_list *head;
        struct poll_list *walk;
-       struct fdtable *fdt;
-       int max_fdset;
        /* Allocate small arguments on the stack to save memory and be
           faster - use long to make sure the buffer is aligned properly
           on 64 bit archs to avoid unaligned access */
@@ -667,11 +665,7 @@ int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds, s64 *timeout)
        struct poll_list *stack_pp = NULL;
 
        /* Do a sanity check on nfds ... */
-       rcu_read_lock();
-       fdt = files_fdtable(current->files);
-       max_fdset = fdt->max_fdset;
-       rcu_read_unlock();
-       if (nfds > max_fdset && nfds > OPEN_MAX)
+       if (nfds > current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
                return -EINVAL;
 
        poll_initwait(&table);
@@ -746,9 +740,9 @@ out_fds:
 asmlinkage long sys_poll(struct pollfd __user *ufds, unsigned int nfds,
                        long timeout_msecs)
 {
-       s64 timeout_jiffies = 0;
+       s64 timeout_jiffies;
 
-       if (timeout_msecs) {
+       if (timeout_msecs > 0) {
 #if HZ > 1000
                /* We can only overflow if HZ > 1000 */
                if (timeout_msecs / 1000 > (s64)0x7fffffffffffffffULL / (s64)HZ)
@@ -756,6 +750,9 @@ asmlinkage long sys_poll(struct pollfd __user *ufds, unsigned int nfds,
                else
 #endif
                        timeout_jiffies = msecs_to_jiffies(timeout_msecs);
+       } else {
+               /* Infinite (< 0) or no (0) timeout */
+               timeout_jiffies = timeout_msecs;
        }
 
        return do_sys_poll(ufds, nfds, &timeout_jiffies);