switch simple cases of fget_light to fdget

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

4 files changed, 30 insertions, 38 deletions

diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
index d6c49e67d3f..f1daf7ae42e 100644
--- a/arch/alpha/kernel/osf_sys.c
+++ b/arch/alpha/kernel/osf_sys.c
@@ -144,28 +144,25 @@ SYSCALL_DEFINE4(osf_getdirentries, unsigned int, fd,
                 struct osf_dirent __user *, dirent, unsigned int, count,
                 long __user *, basep)
 {
-        int error, fput_needed;
-        struct file *file;
+        int error;
+        struct fd arg = fdget(fd);
         struct osf_dirent_callback buf;
 
-        error = -EBADF;
-        file = fget_light(fd, &fput_needed);
-        if (!file)
-                goto out;
+        if (!arg.file)
+                return -EBADF;
 
         buf.dirent = dirent;
         buf.basep = basep;
         buf.count = count;
         buf.error = 0;
 
-        error = vfs_readdir(file, osf_filldir, &buf);
+        error = vfs_readdir(arg.file, osf_filldir, &buf);
         if (error >= 0)
                 error = buf.error;
         if (count != buf.count)
                 error = count - buf.count;
 
-        fput_light(file, fput_needed);
- out:
+        fdput(arg);
         return error;
 }
 
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c
index ff5d4e4c373..e3bd7b8acea 100644
--- a/arch/ia64/kernel/perfmon.c
+++ b/arch/ia64/kernel/perfmon.c
@@ -4780,7 +4780,7 @@ recheck:
 asmlinkage long
 sys_perfmonctl (int fd, int cmd, void __user *arg, int count)
 {
-        struct file *file = NULL;
+        struct fd f = {NULL, 0};
         pfm_context_t *ctx = NULL;
         unsigned long flags = 0UL;
         void *args_k = NULL;
@@ -4789,7 +4789,6 @@ sys_perfmonctl (int fd, int cmd, void __user *arg, int count)
         int narg, completed_args = 0, call_made = 0, cmd_flags;
         int (*func)(pfm_context_t *ctx, void *arg, int count, struct pt_regs *regs);
         int (*getsize)(void *arg, size_t *sz);
-        int fput_needed;
 #define PFM_MAX_ARGSIZE 4096
 
         /*
@@ -4878,17 +4877,17 @@ restart_args:
 
         ret = -EBADF;
 
-        file = fget_light(fd, &fput_needed);
-        if (unlikely(file == NULL)) {
+        f = fdget(fd);
+        if (unlikely(f.file == NULL)) {
                 DPRINT(("invalid fd %d\n", fd));
                 goto error_args;
         }
-        if (unlikely(PFM_IS_FILE(file) == 0)) {
+        if (unlikely(PFM_IS_FILE(f.file) == 0)) {
                 DPRINT(("fd %d not related to perfmon\n", fd));
                 goto error_args;
         }
 
-        ctx = file->private_data;
+        ctx = f.file->private_data;
         if (unlikely(ctx == NULL)) {
                 DPRINT(("no context for fd %d\n", fd));
                 goto error_args;
@@ -4918,8 +4917,8 @@ abort_locked:
         if (call_made && PFM_CMD_RW_ARG(cmd) && copy_to_user(arg, args_k, base_sz*count)) ret = -EFAULT;
 
 error_args:
-        if (file)
-                fput_light(file, fput_needed);
+        if (f.file)
+                fdput(f);
 
         kfree(args_k);
 
diff --git a/arch/parisc/hpux/fs.c b/arch/parisc/hpux/fs.c
index 41e01832cb2..6785de7bd2a 100644
--- a/arch/parisc/hpux/fs.c
+++ b/arch/parisc/hpux/fs.c
@@ -109,33 +109,32 @@ Efault:
 
 int hpux_getdents(unsigned int fd, struct hpux_dirent __user *dirent, unsigned int count)
 {
-        struct file * file;
+        struct fd arg;
         struct hpux_dirent __user * lastdirent;
         struct getdents_callback buf;
-        int error = -EBADF, fput_needed;
+        int error;
 
-        file = fget_light(fd, &fput_needed);
-        if (!file)
-                goto out;
+        arg = fdget(fd);
+        if (!arg.file)
+                return -EBADF;
 
         buf.current_dir = dirent;
         buf.previous = NULL;
         buf.count = count;
         buf.error = 0;
 
-        error = vfs_readdir(file, filldir, &buf);
+        error = vfs_readdir(arg.file, filldir, &buf);
         if (error >= 0)
                 error = buf.error;
         lastdirent = buf.previous;
         if (lastdirent) {
-                if (put_user(file->f_pos, &lastdirent->d_off))
+                if (put_user(arg.file->f_pos, &lastdirent->d_off))
                         error = -EFAULT;
                 else
                         error = count - buf.count;
         }
 
-        fput_light(file, fput_needed);
-out:
+        fdput(arg);
         return error;
 }
 
diff --git a/arch/powerpc/platforms/cell/spu_syscalls.c b/arch/powerpc/platforms/cell/spu_syscalls.c
index 714bbfc3162..db4e638cf40 100644
--- a/arch/powerpc/platforms/cell/spu_syscalls.c
+++ b/arch/powerpc/platforms/cell/spu_syscalls.c
@@ -69,8 +69,6 @@ SYSCALL_DEFINE4(spu_create, const char __user *, name, unsigned int, flags,
         umode_t, mode, int, neighbor_fd)
 {
         long ret;
-        struct file *neighbor;
-        int fput_needed;
         struct spufs_calls *calls;
 
         calls = spufs_calls_get();
@@ -78,11 +76,11 @@ SYSCALL_DEFINE4(spu_create, const char __user *, name, unsigned int, flags,
                 return -ENOSYS;
 
         if (flags & SPU_CREATE_AFFINITY_SPU) {
+                struct fd neighbor = fdget(neighbor_fd);
                 ret = -EBADF;
-                neighbor = fget_light(neighbor_fd, &fput_needed);
-                if (neighbor) {
-                        ret = calls->create_thread(name, flags, mode, neighbor);
-                        fput_light(neighbor, fput_needed);
+                if (neighbor.file) {
+                        ret = calls->create_thread(name, flags, mode, neighbor.file);
+                        fdput(neighbor);
                 }
         } else
                 ret = calls->create_thread(name, flags, mode, NULL);
@@ -94,8 +92,7 @@ SYSCALL_DEFINE4(spu_create, const char __user *, name, unsigned int, flags,
 asmlinkage long sys_spu_run(int fd, __u32 __user *unpc, __u32 __user *ustatus)
 {
         long ret;
-        struct file *filp;
-        int fput_needed;
+        struct fd arg;
         struct spufs_calls *calls;
 
         calls = spufs_calls_get();
@@ -103,10 +100,10 @@ asmlinkage long sys_spu_run(int fd, __u32 __user *unpc, __u32 __user *ustatus)
                 return -ENOSYS;
 
         ret = -EBADF;
-        filp = fget_light(fd, &fput_needed);
-        if (filp) {
-                ret = calls->spu_run(filp, unpc, ustatus);
-                fput_light(filp, fput_needed);
+        arg = fdget(fd);
+        if (arg.file) {
+                ret = calls->spu_run(arg.file, unpc, ustatus);
+                fdput(arg);
         }
 
         spufs_calls_put(calls);