From: Liam R. Howlett <Liam.Howlett@Oracle.com>
Date: Fri, 9 Oct 2020 19:57:40 +0000 (-0400)
Subject: mm/mmap: Change vm_brk_flags() to use mm_populate_vma()
X-Git-Tag: howlett/maple_spf/20210120~55
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e58fd74543c4c2aed89f32a049d4bef9961bcd0a;p=users%2Fjedix%2Flinux-maple.git

mm/mmap: Change vm_brk_flags() to use mm_populate_vma()

Skip searching for the vma to populate after creating it by passing in a pointer.

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

diff --git a/mm/mmap.c b/mm/mmap.c
index 225577e826bd..307fc4721a1c 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -3064,10 +3064,10 @@ int vm_brk_flags(unsigned long addr, unsigned long request, unsigned long flags)
 	// This vma left intentionally blank.
 	mas_walk(&mas);
 	ret = do_brk_flags(&mas, &vma, addr, len, flags);
-	populate = ((mm->def_flags & VM_LOCKED) != 0);
 	mmap_write_unlock(mm);
+	populate = ((mm->def_flags & VM_LOCKED) != 0);
 	if (populate && !ret)
-		mm_populate(addr, len);
+		mm_populate_vma(vma, addr, addr + len);
 	return ret;
 }
 EXPORT_SYMBOL(vm_brk_flags);