make get_file() return its argument

simplifies a bunch of callers...

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

16 files changed, 23 insertions, 38 deletions

diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c
index 79826c13b8b6..ff5d4e4c3733 100644
--- a/arch/ia64/kernel/perfmon.c
+++ b/arch/ia64/kernel/perfmon.c
@@ -2306,7 +2306,7 @@ pfm_smpl_buffer_alloc(struct task_struct *task, struct file *filp, pfm_context_t
          * partially initialize the vma for the sampling buffer
          */
         vma->vm_mm           = mm;
-        vma->vm_file         = filp;
+        vma->vm_file         = get_file(filp);
         vma->vm_flags        = VM_READ| VM_MAYREAD |VM_RESERVED;
         vma->vm_page_prot    = PAGE_READONLY; /* XXX may need to change */
 
@@ -2345,8 +2345,6 @@ pfm_smpl_buffer_alloc(struct task_struct *task, struct file *filp, pfm_context_t
                 goto error;
         }
 
-        get_file(filp);
-
         /*
          * now insert the vma in the vm list for the process, must be
          * done with mmap lock held
diff --git a/drivers/base/dma-buf.c b/drivers/base/dma-buf.c
index c30f3e1d0efc..460e22dee36d 100644
--- a/drivers/base/dma-buf.c
+++ b/drivers/base/dma-buf.c
@@ -460,8 +460,7 @@ int dma_buf_mmap(struct dma_buf *dmabuf, struct vm_area_struct *vma,
         if (vma->vm_file)
                 fput(vma->vm_file);
 
-        vma->vm_file = dmabuf->file;
-        get_file(vma->vm_file);
+        vma->vm_file = get_file(dmabuf->file);
 
         vma->vm_pgoff = pgoff;
 
diff --git a/drivers/staging/omapdrm/omap_gem.c b/drivers/staging/omapdrm/omap_gem.c
index 3a0d035a9e03..2a6bb7f9ee68 100644
--- a/drivers/staging/omapdrm/omap_gem.c
+++ b/drivers/staging/omapdrm/omap_gem.c
@@ -566,9 +566,8 @@ int omap_gem_mmap_obj(struct drm_gem_object *obj,
                  * in particular in the case of mmap'd dmabufs)
                  */
                 fput(vma->vm_file);
-                get_file(obj->filp);
                 vma->vm_pgoff = 0;
-                vma->vm_file  = obj->filp;
+                vma->vm_file  = get_file(obj->filp);
 
                 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
         }
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index 71d95cfbabec..c7561f29d894 100644
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@ -1163,10 +1163,8 @@ ssize_t redirected_tty_write(struct file *file, const char __user *buf,
         struct file *p = NULL;
 
         spin_lock(&redirect_lock);
-        if (redirect) {
-                get_file(redirect);
-                p = redirect;
-        }
+        if (redirect)
+                p = get_file(redirect);
         spin_unlock(&redirect_lock);
 
         if (p) {
@@ -2246,8 +2244,7 @@ static int tioccons(struct file *file)
                 spin_unlock(&redirect_lock);
                 return -EBUSY;
         }
-        get_file(file);
-        redirect = file;
+        redirect = get_file(file);
         spin_unlock(&redirect_lock);
         return 0;
 }
diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
index da8876d38a7b..dce436e595c1 100644
--- a/fs/autofs4/waitq.c
+++ b/fs/autofs4/waitq.c
@@ -175,8 +175,7 @@ static void autofs4_notify_daemon(struct autofs_sb_info *sbi,
                 return;
         }
 
-        pipe = sbi->pipe;
-        get_file(pipe);
+        pipe = get_file(sbi->pipe);
 
         mutex_unlock(&sbi->wq_mutex);
 
diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
index f4246cfc8d87..8c23fa7a91e6 100644
--- a/fs/fuse/dev.c
+++ b/fs/fuse/dev.c
@@ -148,8 +148,7 @@ static struct fuse_req *get_reserved_req(struct fuse_conn *fc,
                 if (ff->reserved_req) {
                         req = ff->reserved_req;
                         ff->reserved_req = NULL;
-                        get_file(file);
-                        req->stolen_file = file;
+                        req->stolen_file = get_file(file);
                 }
                 spin_unlock(&fc->lock);
         } while (!req);
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index cc894eda385a..48a1bad37334 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -2837,8 +2837,7 @@ static int nfs4_setlease(struct nfs4_delegation *dp, int flag)
                 return -ENOMEM;
         }
         fp->fi_lease = fl;
-        fp->fi_deleg_file = fl->fl_file;
-        get_file(fp->fi_deleg_file);
+        fp->fi_deleg_file = get_file(fl->fl_file);
         atomic_set(&fp->fi_delegees, 1);
         list_add(&dp->dl_perfile, &fp->fi_delegations);
         return 0;
diff --git a/fs/proc/base.c b/fs/proc/base.c
index b55c3bb298e3..f1e8438d21b5 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -1979,8 +1979,7 @@ proc_map_files_readdir(struct file *filp, void *dirent, filldir_t filldir)
                                 if (++pos <= filp->f_pos)
                                         continue;
 
-                                get_file(vma->vm_file);
-                                info.file = vma->vm_file;
+                                info.file = get_file(vma->vm_file);
                                 info.len = snprintf(info.name,
                                                 sizeof(info.name), "%lx-%lx",
                                                 vma->vm_start, vma->vm_end);
diff --git a/fs/select.c b/fs/select.c
index db14c781335e..ffdd16d6e691 100644
--- a/fs/select.c
+++ b/fs/select.c
@@ -220,8 +220,7 @@ static void __pollwait(struct file *filp, wait_queue_head_t *wait_address,
         struct poll_table_entry *entry = poll_get_entry(pwq);
         if (!entry)
                 return;
-        get_file(filp);
-        entry->filp = filp;
+        entry->filp = get_file(filp);
         entry->wait_address = wait_address;
         entry->key = p->_key;
         init_waitqueue_func_entry(&entry->wait, pollwake);
diff --git a/include/linux/fs.h b/include/linux/fs.h
index aa110476a95b..de1db1c12080 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1074,7 +1074,11 @@ struct file_handle {
         unsigned char f_handle[0];
 };
 
-#define get_file(x)     atomic_long_inc(&(x)->f_count)
+static inline struct file *get_file(struct file *f)
+{
+        atomic_long_inc(&f->f_count);
+        return f;
+}
 #define fput_atomic(x)  atomic_long_add_unless(&(x)->f_count, -1, 1)
 #define file_count(x)   atomic_long_read(&(x)->f_count)
 
diff --git a/mm/fremap.c b/mm/fremap.c
index 9ed4fd432467..048659c0c03d 100644
--- a/mm/fremap.c
+++ b/mm/fremap.c
@@ -195,10 +195,9 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
                  */
                 if (mapping_cap_account_dirty(mapping)) {
                         unsigned long addr;
-                        struct file *file = vma->vm_file;
+                        struct file *file = get_file(vma->vm_file);
 
                         flags &= MAP_NONBLOCK;
-                        get_file(file);
                         addr = mmap_region(file, start, size,
                                         flags, vma->vm_flags, pgoff);
                         fput(file);
diff --git a/mm/mmap.c b/mm/mmap.c
index ae18a48e7e4e..872441e81914 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -1301,8 +1301,7 @@ munmap_back:
                                 goto free_vma;
                         correct_wcount = 1;
                 }
-                vma->vm_file = file;
-                get_file(file);
+                vma->vm_file = get_file(file);
                 error = file->f_op->mmap(file, vma);
                 if (error)
                         goto unmap_and_free_vma;
diff --git a/mm/nommu.c b/mm/nommu.c
index d4b0c10872de..dee2ff89fd58 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -1282,10 +1282,8 @@ unsigned long do_mmap_pgoff(struct file *file,
         vma->vm_pgoff = pgoff;
 
         if (file) {
-                region->vm_file = file;
-                get_file(file);
-                vma->vm_file = file;
-                get_file(file);
+                region->vm_file = get_file(file);
+                vma->vm_file = get_file(file);
                 if (vm_flags & VM_EXECUTABLE) {
                         added_exe_file_vma(current->mm);
                         vma->vm_mm = current->mm;
diff --git a/net/compat.c b/net/compat.c
index 74ed1d7a84a2..79ae88485001 100644
--- a/net/compat.c
+++ b/net/compat.c
@@ -301,8 +301,7 @@ void scm_detach_fds_compat(struct msghdr *kmsg, struct scm_cookie *scm)
                         break;
                 }
                 /* Bump the usage count and install the file. */
-                get_file(fp[i]);
-                fd_install(new_fd, fp[i]);
+                fd_install(new_fd, get_file(fp[i]));
         }
 
         if (i > 0) {
diff --git a/net/core/scm.c b/net/core/scm.c
index 040cebeed45b..b0098d259233 100644
--- a/net/core/scm.c
+++ b/net/core/scm.c
@@ -281,11 +281,10 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
                         break;
                 }
                 /* Bump the usage count and install the file. */
-                get_file(fp[i]);
                 sock = sock_from_file(fp[i], &err);
                 if (sock)
                         sock_update_netprioidx(sock->sk, current);
-                fd_install(new_fd, fp[i]);
+                fd_install(new_fd, get_file(fp[i]));
         }
 
         if (i > 0)
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 4dfbcea10eb7..651d8456611a 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -2135,8 +2135,7 @@ static inline void flush_unauthorized_files(const struct cred *cred,
         if (!IS_ERR(devnull)) {
                 /* replace all the matching ones with this */
                 do {
-                        get_file(devnull);
-                        replace_fd(n - 1, devnull, 0);
+                        replace_fd(n - 1, get_file(devnull), 0);
                 } while ((n = iterate_fd(files, n, match_file, cred)) != 0);
                 fput(devnull);
         } else {