mm/memory: Fix zap_page_range

Use mas_for_each to avoid calling unmap_single_vma for the start VMA twice.

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

diff --git a/mm/memory.c b/mm/memory.c
index 1e5794a542493b1c7665be03f0ddffb5f27d1891..03f3ae8068e40a3ae6493c67219b6e3f38b34b0c 100644 (file)
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -1551,9 +1551,9 @@ void zap_page_range(struct vm_area_struct *vma, unsigned long start,
        tlb_gather_mmu(&tlb, vma->vm_mm, start, end);
        update_hiwater_rss(vma->vm_mm);
        mmu_notifier_invalidate_range_start(&range);
-       do {
+       mas_for_each(&mas, vma, end - 1)
                unmap_single_vma(&tlb, vma, start, end, NULL);
-       } while ((vma = mas_find(&mas, end - 1)) != NULL);
+
        mmu_notifier_invalidate_range_end(&range);
        tlb_finish_mmu(&tlb, start, end);
 }