switch simple cases of fget_light to fdget

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

1 files changed, 10 insertions, 15 deletions

diff --git a/fs/eventpoll.c b/fs/eventpoll.c
index 567ae72e155d..cd96649bfe62 100644
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@ -1809,8 +1809,8 @@ error_return:
 SYSCALL_DEFINE4(epoll_wait, int, epfd, struct epoll_event __user *, events,
                 int, maxevents, int, timeout)
 {
-        int error, fput_needed;
-        struct file *file;
+        int error;
+        struct fd f;
         struct eventpoll *ep;
 
         /* The maximum number of event must be greater than zero */
@@ -1818,38 +1818,33 @@ SYSCALL_DEFINE4(epoll_wait, int, epfd, struct epoll_event __user *, events,
                 return -EINVAL;
 
         /* Verify that the area passed by the user is writeable */
-        if (!access_ok(VERIFY_WRITE, events, maxevents * sizeof(struct epoll_event))) {
-                error = -EFAULT;
-                goto error_return;
-        }
+        if (!access_ok(VERIFY_WRITE, events, maxevents * sizeof(struct epoll_event)))
+                return -EFAULT;
 
         /* Get the "struct file *" for the eventpoll file */
-        error = -EBADF;
-        file = fget_light(epfd, &fput_needed);
-        if (!file)
-                goto error_return;
+        f = fdget(epfd);
+        if (!f.file)
+                return -EBADF;
 
         /*
          * We have to check that the file structure underneath the fd
          * the user passed to us _is_ an eventpoll file.
          */
         error = -EINVAL;
-        if (!is_file_epoll(file))
+        if (!is_file_epoll(f.file))
                 goto error_fput;
 
         /*
          * At this point it is safe to assume that the "private_data" contains
          * our own data structure.
          */
-        ep = file->private_data;
+        ep = f.file->private_data;
 
         /* Time to fish for events ... */
         error = ep_poll(ep, events, maxevents, timeout);
 
 error_fput:
-        fput_light(file, fput_needed);
-error_return:
-
+        fdput(f);
         return error;
 }