From: Liam R. Howlett <Liam.Howlett@oracle.com>
Date: Wed, 5 Apr 2023 15:43:07 +0000 (-0400)
Subject: mm/mmap: Change do_vmi_align_munmap() for maple tree iterator changes
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=4cd2f8abd02efe46c3766c8ee61fbf796070fef2;p=users%2Fjedix%2Flinux-maple.git

mm/mmap: Change do_vmi_align_munmap() for maple tree iterator changes

The maple tree iterator clean up is incompatible with the way
do_vmi_align_munmap() expects it to behave.  Update the expected
behaviour to map now since the change will work currently.

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

diff --git a/mm/mmap.c b/mm/mmap.c
index fe1db604dc49..391ade554742 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -2385,6 +2385,8 @@ do_mas_align_munmap(struct ma_state *mas, struct vm_area_struct *vma,
 #endif
 	}
 
+	if (mas->last >= end)
+		next = mas_walk(mas);
 	if (!next)
 		next = mas_next(mas, ULONG_MAX);