Merge branch 'x86/vdso' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip...

[firefly-linux-kernel-4.4.55.git] / mm / mmap.c

diff --git a/mm/mmap.c b/mm/mmap.c
index 52bbc9514d9d005c470bc5292fc0946fc74f7794..ced5efcdd4b6c7763e7ab6435db128a638e78059 100644 (file)
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -640,11 +640,10 @@ static void vma_link(struct mm_struct *mm, struct vm_area_struct *vma,
 {
        struct address_space *mapping = NULL;
 
-       if (vma->vm_file)
+       if (vma->vm_file) {
                mapping = vma->vm_file->f_mapping;
-
-       if (mapping)
                mutex_lock(&mapping->i_mmap_mutex);
+       }
 
        __vma_link(mm, vma, prev, rb_link, rb_parent);
        __vma_link_file(vma);
@@ -2996,9 +2995,7 @@ int install_special_mapping(struct mm_struct *mm,
                mm, addr, len, vm_flags, &legacy_special_mapping_vmops,
                (void *)pages);
 
-       if (IS_ERR(vma))
-               return PTR_ERR(vma);
-       return 0;
+       return PTR_ERR_OR_ZERO(vma);
 }
 
 static DEFINE_MUTEX(mm_all_locks_mutex);