2 files changed, 27 insertions, 29 deletions

diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
index ea48693940f1..721d692fa8d4 100644
--- a/fs/notify/fanotify/fanotify_user.c
+++ b/fs/notify/fanotify/fanotify_user.c
@@ -451,24 +451,22 @@ static int fanotify_find_path(int dfd, const char __user *filename,
                  dfd, filename, flags);
 
         if (filename == NULL) {
-                struct file *file;
-                int fput_needed;
+                struct fd f = fdget(dfd);
 
                 ret = -EBADF;
-                file = fget_light(dfd, &fput_needed);
-                if (!file)
+                if (!f.file)
                         goto out;
 
                 ret = -ENOTDIR;
                 if ((flags & FAN_MARK_ONLYDIR) &&
-                    !(S_ISDIR(file->f_path.dentry->d_inode->i_mode))) {
-                        fput_light(file, fput_needed);
+                    !(S_ISDIR(f.file->f_path.dentry->d_inode->i_mode))) {
+                        fdput(f);
                         goto out;
                 }
 
-                *path = file->f_path;
+                *path = f.file->f_path;
                 path_get(path);
-                fput_light(file, fput_needed);
+                fdput(f);
         } else {
                 unsigned int lookup_flags = 0;
 
@@ -748,9 +746,9 @@ SYSCALL_DEFINE(fanotify_mark)(int fanotify_fd, unsigned int flags,
         struct inode *inode = NULL;
         struct vfsmount *mnt = NULL;
         struct fsnotify_group *group;
-        struct file *filp;
+        struct fd f;
         struct path path;
-        int ret, fput_needed;
+        int ret;
 
         pr_debug("%s: fanotify_fd=%d flags=%x dfd=%d pathname=%p mask=%llx\n",
                  __func__, fanotify_fd, flags, dfd, pathname, mask);
@@ -784,15 +782,15 @@ SYSCALL_DEFINE(fanotify_mark)(int fanotify_fd, unsigned int flags,
 #endif
                 return -EINVAL;
 
-        filp = fget_light(fanotify_fd, &fput_needed);
-        if (unlikely(!filp))
+        f = fdget(fanotify_fd);
+        if (unlikely(!f.file))
                 return -EBADF;
 
         /* verify that this is indeed an fanotify instance */
         ret = -EINVAL;
-        if (unlikely(filp->f_op != &fanotify_fops))
+        if (unlikely(f.file->f_op != &fanotify_fops))
                 goto fput_and_out;
-        group = filp->private_data;
+        group = f.file->private_data;
 
         /*
          * group->priority == FS_PRIO_0 == FAN_CLASS_NOTIF.  These are not
@@ -839,7 +837,7 @@ SYSCALL_DEFINE(fanotify_mark)(int fanotify_fd, unsigned int flags,
 
         path_put(&path);
 fput_and_out:
-        fput_light(filp, fput_needed);
+        fdput(f);
         return ret;
 }
 
diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c
index 8445fbc8985c..c311dda054a3 100644
--- a/fs/notify/inotify/inotify_user.c
+++ b/fs/notify/inotify/inotify_user.c
@@ -757,16 +757,16 @@ SYSCALL_DEFINE3(inotify_add_watch, int, fd, const char __user *, pathname,
         struct fsnotify_group *group;
         struct inode *inode;
         struct path path;
-        struct file *filp;
-        int ret, fput_needed;
+        struct fd f;
+        int ret;
         unsigned flags = 0;
 
-        filp = fget_light(fd, &fput_needed);
-        if (unlikely(!filp))
+        f = fdget(fd);
+        if (unlikely(!f.file))
                 return -EBADF;
 
         /* verify that this is indeed an inotify instance */
-        if (unlikely(filp->f_op != &inotify_fops)) {
+        if (unlikely(f.file->f_op != &inotify_fops)) {
                 ret = -EINVAL;
                 goto fput_and_out;
         }
@@ -782,13 +782,13 @@ SYSCALL_DEFINE3(inotify_add_watch, int, fd, const char __user *, pathname,
 
         /* inode held in place by reference to path; group by fget on fd */
         inode = path.dentry->d_inode;
-        group = filp->private_data;
+        group = f.file->private_data;
 
         /* create/update an inode mark */
         ret = inotify_update_watch(group, inode, mask);
         path_put(&path);
 fput_and_out:
-        fput_light(filp, fput_needed);
+        fdput(f);
         return ret;
 }
 
@@ -796,19 +796,19 @@ SYSCALL_DEFINE2(inotify_rm_watch, int, fd, __s32, wd)
 {
         struct fsnotify_group *group;
         struct inotify_inode_mark *i_mark;
-        struct file *filp;
-        int ret = 0, fput_needed;
+        struct fd f;
+        int ret = 0;
 
-        filp = fget_light(fd, &fput_needed);
-        if (unlikely(!filp))
+        f = fdget(fd);
+        if (unlikely(!f.file))
                 return -EBADF;
 
         /* verify that this is indeed an inotify instance */
         ret = -EINVAL;
-        if (unlikely(filp->f_op != &inotify_fops))
+        if (unlikely(f.file->f_op != &inotify_fops))
                 goto out;
 
-        group = filp->private_data;
+        group = f.file->private_data;
 
         ret = -EINVAL;
         i_mark = inotify_idr_find(group, wd);
@@ -823,7 +823,7 @@ SYSCALL_DEFINE2(inotify_rm_watch, int, fd, __s32, wd)
         fsnotify_put_mark(&i_mark->fsn_mark);
 
 out:
-        fput_light(filp, fput_needed);
+        fdput(f);
         return ret;
 }