switch simple cases of fget_light to fdget

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

1 files changed, 17 insertions, 18 deletions

diff --git a/mm/fadvise.c b/mm/fadvise.c
index a83245763cf8..a47f0f50c89f 100644
--- a/mm/fadvise.c
+++ b/mm/fadvise.c
@@ -26,8 +26,7 @@
  */
 SYSCALL_DEFINE(fadvise64_64)(int fd, loff_t offset, loff_t len, int advice)
 {
-        int fput_needed;
-        struct file *file = fget_light(fd, &fput_needed);
+        struct fd f = fdget(fd);
         struct address_space *mapping;
         struct backing_dev_info *bdi;
         loff_t endbyte;                 /* inclusive */
@@ -36,15 +35,15 @@ SYSCALL_DEFINE(fadvise64_64)(int fd, loff_t offset, loff_t len, int advice)
         unsigned long nrpages;
         int ret = 0;
 
-        if (!file)
+        if (!f.file)
                 return -EBADF;
 
-        if (S_ISFIFO(file->f_path.dentry->d_inode->i_mode)) {
+        if (S_ISFIFO(f.file->f_path.dentry->d_inode->i_mode)) {
                 ret = -ESPIPE;
                 goto out;
         }
 
-        mapping = file->f_mapping;
+        mapping = f.file->f_mapping;
         if (!mapping || len < 0) {
                 ret = -EINVAL;
                 goto out;
@@ -77,21 +76,21 @@ SYSCALL_DEFINE(fadvise64_64)(int fd, loff_t offset, loff_t len, int advice)
 
         switch (advice) {
         case POSIX_FADV_NORMAL:
-                file->f_ra.ra_pages = bdi->ra_pages;
-                spin_lock(&file->f_lock);
-                file->f_mode &= ~FMODE_RANDOM;
-                spin_unlock(&file->f_lock);
+                f.file->f_ra.ra_pages = bdi->ra_pages;
+                spin_lock(&f.file->f_lock);
+                f.file->f_mode &= ~FMODE_RANDOM;
+                spin_unlock(&f.file->f_lock);
                 break;
         case POSIX_FADV_RANDOM:
-                spin_lock(&file->f_lock);
-                file->f_mode |= FMODE_RANDOM;
-                spin_unlock(&file->f_lock);
+                spin_lock(&f.file->f_lock);
+                f.file->f_mode |= FMODE_RANDOM;
+                spin_unlock(&f.file->f_lock);
                 break;
         case POSIX_FADV_SEQUENTIAL:
-                file->f_ra.ra_pages = bdi->ra_pages * 2;
-                spin_lock(&file->f_lock);
-                file->f_mode &= ~FMODE_RANDOM;
-                spin_unlock(&file->f_lock);
+                f.file->f_ra.ra_pages = bdi->ra_pages * 2;
+                spin_lock(&f.file->f_lock);
+                f.file->f_mode &= ~FMODE_RANDOM;
+                spin_unlock(&f.file->f_lock);
                 break;
         case POSIX_FADV_WILLNEED:
                 /* First and last PARTIAL page! */
@@ -107,7 +106,7 @@ SYSCALL_DEFINE(fadvise64_64)(int fd, loff_t offset, loff_t len, int advice)
                  * Ignore return value because fadvise() shall return
                  * success even if filesystem can't retrieve a hint,
                  */
-                force_page_cache_readahead(mapping, file, start_index,
+                force_page_cache_readahead(mapping, f.file, start_index,
                                            nrpages);
                 break;
         case POSIX_FADV_NOREUSE:
@@ -129,7 +128,7 @@ SYSCALL_DEFINE(fadvise64_64)(int fd, loff_t offset, loff_t len, int advice)
                 ret = -EINVAL;
         }
 out:
-        fput_light(file, fput_needed);
+        fdput(f);
         return ret;
 }
 #ifdef CONFIG_HAVE_SYSCALL_WRAPPERS