make get_file() return its argument

simplifies a bunch of callers...

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

3 files changed, 4 insertions, 8 deletions

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;