mm/gup: Fix potential sleep issue in __mm_populate

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

diff --git a/mm/gup.c b/mm/gup.c
index 0f375f6ef0a38204807608b266250672820d24c4..28ade832baf607585740eee9cd128a274f005c99 100644 (file)
--- a/mm/gup.c
+++ b/mm/gup.c
@@ -1551,10 +1551,8 @@ int __mm_populate(unsigned long start, unsigned long len, int ignore_errors)
        struct vm_area_struct *vma = NULL;
        int locked = 0;
        long ret = 0;
-       MA_STATE(mas, &mm->mm_mt, start, start);
 
        end = start + len;
-
        for (nstart = start; nstart < end; nstart = nend) {
                /*
                 * We want to fault in pages for [nstart; end) address range.
@@ -1563,9 +1561,9 @@ int __mm_populate(unsigned long start, unsigned long len, int ignore_errors)
                if (!locked) {
                        locked = 1;
                        mmap_read_lock(mm);
-                       vma = mas_find(&mas, end);
+                       vma = find_vma_intersection(mm, start, end);
                } else if (nstart >= vma->vm_end)
-                       vma = mas_next(&mas, end);
+                       vma = vma_next(mm, vma);
                if (!vma)
                        break;
                /*