From: Liam R. Howlett <Liam.Howlett@Oracle.com>
Date: Thu, 26 Nov 2020 18:51:52 +0000 (-0500)
Subject: mm/mmap: Move __vma_adjust update of highest_vm_end
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=53cde8d0c78e07525b244fedb4817f61b68931f9;p=users%2Fjedix%2Flinux-maple.git

mm/mmap: Move __vma_adjust update of highest_vm_end

Move the highest_vm_end update to avoid checking if the end changed more than once.

Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com>
---

diff --git a/mm/mmap.c b/mm/mmap.c
index ba32eee7f020..b103e7b4b0d0 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -884,6 +884,8 @@ again:
 		else
 			vma_changed = true;
 		vma->vm_end = end;
+		if (!next)
+			mm->highest_vm_end = vm_end_gap(vma);
 	}
 
 	if (vma_changed)
@@ -914,8 +916,6 @@ again:
 		 * (it may either follow vma or precede it).
 		 */
 		__insert_vm_struct(mm, insert);
-	} else if (vma_changed && !next) {
-		mm->highest_vm_end = vm_end_gap(vma);
 	}
 
 	if (anon_vma) {