Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[~andy/linux] / mm / fremap.c

diff --git a/mm/fremap.c b/mm/fremap.c
index 9ed4fd432467ee45a5310cd152fbba4399cbf722..048659c0c03d9abb429173217cf06454a471074f 100644 (file)
--- 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);