switch simple cases of fget_light to fdget

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

5 files changed, 33 insertions, 38 deletions

diff --git a/drivers/infiniband/core/ucma.c b/drivers/infiniband/core/ucma.c
index 6b2ae729de92..6f28da9f4cad 100644
--- a/drivers/infiniband/core/ucma.c
+++ b/drivers/infiniband/core/ucma.c
@@ -1184,20 +1184,20 @@ static ssize_t ucma_migrate_id(struct ucma_file *new_file,
         struct rdma_ucm_migrate_id cmd;
         struct rdma_ucm_migrate_resp resp;
         struct ucma_context *ctx;
-        struct file *filp;
+        struct fd f;
         struct ucma_file *cur_file;
-        int ret = 0, fput_needed;
+        int ret = 0;
 
         if (copy_from_user(&cmd, inbuf, sizeof(cmd)))
                 return -EFAULT;
 
         /* Get current fd to protect against it being closed */
-        filp = fget_light(cmd.fd, &fput_needed);
-        if (!filp)
+        f = fdget(cmd.fd);
+        if (!f.file)
                 return -ENOENT;
 
         /* Validate current fd and prevent destruction of id. */
-        ctx = ucma_get_ctx(filp->private_data, cmd.id);
+        ctx = ucma_get_ctx(f.file->private_data, cmd.id);
         if (IS_ERR(ctx)) {
                 ret = PTR_ERR(ctx);
                 goto file_put;
@@ -1231,7 +1231,7 @@ response:
 
         ucma_put_ctx(ctx);
 file_put:
-        fput_light(filp, fput_needed);
+        fdput(f);
         return ret;
 }
 
diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
index 402679bd30a3..0cb0007724a2 100644
--- a/drivers/infiniband/core/uverbs_cmd.c
+++ b/drivers/infiniband/core/uverbs_cmd.c
@@ -705,9 +705,9 @@ ssize_t ib_uverbs_open_xrcd(struct ib_uverbs_file *file,
         struct ib_udata                 udata;
         struct ib_uxrcd_object         *obj;
         struct ib_xrcd                 *xrcd = NULL;
-        struct file                    *f = NULL;
+        struct fd                       f = {NULL, 0};
         struct inode                   *inode = NULL;
-        int                             ret = 0, fput_needed;
+        int                             ret = 0;
         int                             new_xrcd = 0;
 
         if (out_len < sizeof resp)
@@ -724,13 +724,13 @@ ssize_t ib_uverbs_open_xrcd(struct ib_uverbs_file *file,
 
         if (cmd.fd != -1) {
                 /* search for file descriptor */
-                f = fget_light(cmd.fd, &fput_needed);
-                if (!f) {
+                f = fdget(cmd.fd);
+                if (!f.file) {
                         ret = -EBADF;
                         goto err_tree_mutex_unlock;
                 }
 
-                inode = f->f_dentry->d_inode;
+                inode = f.file->f_path.dentry->d_inode;
                 xrcd = find_xrcd(file->device, inode);
                 if (!xrcd && !(cmd.oflags & O_CREAT)) {
                         /* no file descriptor. Need CREATE flag */
@@ -795,8 +795,8 @@ ssize_t ib_uverbs_open_xrcd(struct ib_uverbs_file *file,
                 goto err_copy;
         }
 
-        if (f)
-                fput_light(f, fput_needed);
+        if (f.file)
+                fdput(f);
 
         mutex_lock(&file->mutex);
         list_add_tail(&obj->uobject.list, &file->ucontext->xrcd_list);
@@ -825,8 +825,8 @@ err:
         put_uobj_write(&obj->uobject);
 
 err_tree_mutex_unlock:
-        if (f)
-                fput_light(f, fput_needed);
+        if (f.file)
+                fdput(f);
 
         mutex_unlock(&file->device->xrcd_tree_mutex);
 
diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c
index acf75c2cf7ef..6f2ce6fa98f8 100644
--- a/drivers/infiniband/core/uverbs_main.c
+++ b/drivers/infiniband/core/uverbs_main.c
@@ -541,17 +541,15 @@ struct file *ib_uverbs_alloc_event_file(struct ib_uverbs_file *uverbs_file,
 struct ib_uverbs_event_file *ib_uverbs_lookup_comp_file(int fd)
 {
         struct ib_uverbs_event_file *ev_file = NULL;
-        struct file *filp;
-        int fput_needed;
+        struct fd f = fdget(fd);
 
-        filp = fget_light(fd, &fput_needed);
-        if (!filp)
+        if (!f.file)
                 return NULL;
 
-        if (filp->f_op != &uverbs_event_fops)
+        if (f.file->f_op != &uverbs_event_fops)
                 goto out;
 
-        ev_file = filp->private_data;
+        ev_file = f.file->private_data;
         if (ev_file->is_async) {
                 ev_file = NULL;
                 goto out;
@@ -560,7 +558,7 @@ struct ib_uverbs_event_file *ib_uverbs_lookup_comp_file(int fd)
         kref_get(&ev_file->ref);
 
 out:
-        fput_light(filp, fput_needed);
+        fdput(f);
         return ev_file;
 }
 
diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c
index 91bcd97d3061..56097c6d072d 100644
--- a/drivers/vfio/vfio.c
+++ b/drivers/vfio/vfio.c
@@ -1014,25 +1014,25 @@ static void vfio_group_try_dissolve_container(struct vfio_group *group)
 
 static int vfio_group_set_container(struct vfio_group *group, int container_fd)
 {
-        struct file *filep;
+        struct fd f;
         struct vfio_container *container;
         struct vfio_iommu_driver *driver;
-        int ret = 0, fput_needed;
+        int ret = 0;
 
         if (atomic_read(&group->container_users))
                 return -EINVAL;
 
-        filep = fget_light(container_fd, &fput_needed);
-        if (!filep)
+        f = fdget(container_fd);
+        if (!f.file)
                 return -EBADF;
 
         /* Sanity check, is this really our fd? */
-        if (filep->f_op != &vfio_fops) {
-                fput_light(filep, fput_needed);
+        if (f.file->f_op != &vfio_fops) {
+                fdput(f);
                 return -EINVAL;
         }
 
-        container = filep->private_data;
+        container = f.file->private_data;
         WARN_ON(!container); /* fget ensures we don't race vfio_release */
 
         mutex_lock(&container->group_lock);
@@ -1054,8 +1054,7 @@ static int vfio_group_set_container(struct vfio_group *group, int container_fd)
 
 unlock_out:
         mutex_unlock(&container->group_lock);
-        fput_light(filep, fput_needed);
-
+        fdput(f);
         return ret;
 }
 
diff --git a/drivers/video/msm/mdp.c b/drivers/video/msm/mdp.c
index cb2ddf164c98..07c9d8ab2c3b 100644
--- a/drivers/video/msm/mdp.c
+++ b/drivers/video/msm/mdp.c
@@ -257,19 +257,17 @@ int get_img(struct mdp_img *img, struct fb_info *info,
             unsigned long *start, unsigned long *len,
             struct file **filep)
 {
-        int put_needed, ret = 0;
-        struct file *file;
-
-        file = fget_light(img->memory_id, &put_needed);
-        if (file == NULL)
+        int ret = 0;
+        struct fd f = fdget(img->memory_id);
+        if (f.file == NULL)
                 return -1;
 
-        if (MAJOR(file->f_dentry->d_inode->i_rdev) == FB_MAJOR) {
+        if (MAJOR(f.file->f_dentry->d_inode->i_rdev) == FB_MAJOR) {
                 *start = info->fix.smem_start;
                 *len = info->fix.smem_len;
         } else
                 ret = -1;
-        fput_light(file, put_needed);
+        fdput(f);
 
         return ret;
 }