From e1d533322b495a134b8a4666be715a9caf7ad32a Mon Sep 17 00:00:00 2001 From: "Liam R. Howlett" Date: Tue, 24 Nov 2020 16:22:25 -0500 Subject: [PATCH] mmap: Update count_vma_pages_range() to only use one ma_state Signed-off-by: Liam R. Howlett --- mm/mmap.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index 2579636f4cf4..5533344dfc56 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -487,17 +487,15 @@ static unsigned long count_vma_pages_range(struct mm_struct *mm, MA_STATE(mas, &mm->mm_mt, addr, addr); /* Find first overlaping mapping */ - vma = find_vma_intersection(mm, addr, end); + vma = mas_find(&mas, end - 1); if (!vma) return 0; vm_start = vma->vm_start; vm_end = vma->vm_end; - nr_pages = (min(end, vm_end) - max(addr, vm_start)) >> PAGE_SHIFT; /* Iterate over the rest of the overlaps */ - mas.index = mas.last = vm_end; mas_for_each(&mas, vma, end) { vm_start = vma->vm_start; vm_end = vma->vm_end; -- 2.50.1