mmap: Update count_vma_pages_range() to only use one ma_state

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

diff --git a/mm/mmap.c b/mm/mmap.c
index 2579636f4cf4746546c62df19911d42908c068e0..5533344dfc564da86169bd093b24321a003e916e 100644 (file)
--- 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;