vserver 2.0 rc7

[linux-2.6.git] / include / linux / poll.h

diff --git a/include/linux/poll.h b/include/linux/poll.h
index 1bb3334..f6da702 100644 (file)
--- a/include/linux/poll.h
+++ b/include/linux/poll.h
@@ -71,13 +71,9 @@ static inline
 int get_fd_set(unsigned long nr, void __user *ufdset, unsigned long *fdset)
 {
        nr = FDS_BYTES(nr);
-       if (ufdset) {
-               int error;
-               error = verify_area(VERIFY_WRITE, ufdset, nr);
-               if (!error && __copy_from_user(fdset, ufdset, nr))
-                       error = -EFAULT;
-               return error;
-       }
+       if (ufdset)
+               return copy_from_user(fdset, ufdset, nr) ? -EFAULT : 0;
+
        memset(fdset, 0, nr);
        return 0;
 }