mm: remove unnecessary indirection

Now we removed the merge logic from __mmap_new_file_vma() we can simply
pass in the vma direct rather than a pointer to a VMA, as pointed out by
Vlastimil.

Link: https://lkml.kernel.org/r/5106696d-e625-4d8a-8545-9d1430301730@lucifer.local
Signed-off-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
Cc: Jann Horn <jannh@google.com>
Cc: Liam R. Howlett <Liam.Howlett@Oracle.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Xu <peterx@redhat.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/mm/vma.c b/mm/vma.c
index 7194f9449c6019070f62e180f90be4ebfd7cad4e..c26bbc898f853cb0cef9e9e2308294e38a489d93 100644 (file)
--- a/mm/vma.c
+++ b/mm/vma.c
@@ -2281,10 +2281,9 @@ static int __mmap_prepare(struct mmap_state *map, struct list_head *uf)
 
 
 static int __mmap_new_file_vma(struct mmap_state *map,
-                              struct vm_area_struct **vmap)
+                              struct vm_area_struct *vma)
 {
        struct vma_iterator *vmi = map->vmi;
-       struct vm_area_struct *vma = *vmap;
        int error;
 
        vma->vm_file = get_file(map->file);
@@ -2352,7 +2351,7 @@ static int __mmap_new_vma(struct mmap_state *map, struct vm_area_struct **vmap)
        }
 
        if (map->file)
-               error = __mmap_new_file_vma(map, &vma);
+               error = __mmap_new_file_vma(map, vma);
        else if (map->flags & VM_SHARED)
                error = shmem_zero_setup(vma);
        else