Merge tag 'gfs2-for-5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2

[linux.git] / mm / mmap.c

diff --git a/mm/mmap.c b/mm/mmap.c
index bc788548c4e588ba4017e51cf8179313ee737bfc..6756b8bb00334c023c73d1a8112785d205e5c927 100644 (file)
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -1270,26 +1270,22 @@ static struct anon_vma *reusable_anon_vma(struct vm_area_struct *old, struct vm_
  */
 struct anon_vma *find_mergeable_anon_vma(struct vm_area_struct *vma)
 {
-       struct anon_vma *anon_vma;
-       struct vm_area_struct *near;
-
-       near = vma->vm_next;
-       if (!near)
-               goto try_prev;
-
-       anon_vma = reusable_anon_vma(near, vma, near);
-       if (anon_vma)
-               return anon_vma;
-try_prev:
-       near = vma->vm_prev;
-       if (!near)
-               goto none;
-
-       anon_vma = reusable_anon_vma(near, near, vma);
-       if (anon_vma)
-               return anon_vma;
-none:
+       struct anon_vma *anon_vma = NULL;
+
+       /* Try next first. */
+       if (vma->vm_next) {
+               anon_vma = reusable_anon_vma(vma->vm_next, vma, vma->vm_next);
+               if (anon_vma)
+                       return anon_vma;
+       }
+
+       /* Try prev next. */
+       if (vma->vm_prev)
+               anon_vma = reusable_anon_vma(vma->vm_prev, vma->vm_prev, vma);
+
        /*
+        * We might reach here with anon_vma == NULL if we can't find
+        * any reusable anon_vma.
         * There's no absolute need to look only at touching neighbours:
         * we could search further afield for "compatible" anon_vmas.
         * But it would probably just be a waste of time searching,
@@ -1297,7 +1293,7 @@ struct anon_vma *find_mergeable_anon_vma(struct vm_area_struct *vma)
         * We're trying to allow mprotect remerging later on,
         * not trying to minimize memory used for anon_vmas.
         */
-       return NULL;
+       return anon_vma;
 }
 
 /*