mm/vmscan: Use vma iterator instead of vm_next

Use the vma iterator in in get_next_vma() instead of the linked list.

Suggested-by: Yu Zhao <yuzhao@google.com>
Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>

diff --git a/mm/vmscan.c b/mm/vmscan.c
index f693720047dbb7b622b1e9e75e3d09aa0f054476..9b292f07621eff844e171fbd4ac7b16c3ebea7ce 100644 (file)
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -3747,23 +3747,14 @@ static bool get_next_vma(unsigned long mask, unsigned long size, struct mm_walk
 {
        unsigned long start = round_up(*vm_end, size);
        unsigned long end = (start | ~mask) + 1;
+       VMA_ITERATOR(vmi, args->mm, start);
 
        VM_WARN_ON_ONCE(mask & size);
        VM_WARN_ON_ONCE((start & mask) != (*vm_start & mask));
 
-       while (args->vma) {
-               if (start >= args->vma->vm_end) {
-                       args->vma = args->vma->vm_next;
+       for_each_vma_range(vmi, args->vma, end) {
+               if (should_skip_vma(args->vma->vm_start, args->vma->vm_end, args))
                        continue;
-               }
-
-               if (end && end <= args->vma->vm_start)
-                       return false;
-
-               if (should_skip_vma(args->vma->vm_start, args->vma->vm_end, args)) {
-                       args->vma = args->vma->vm_next;
-                       continue;
-               }
 
                *vm_start = max(start, args->vma->vm_start);
                *vm_end = min(end - 1, args->vma->vm_end - 1) + 1;