mmap: Convert vma_link() vma iterator

Avoid using the maple tree interface directly.

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

diff --git a/mm/mmap.c b/mm/mmap.c
index 3950776717d8d97275ea1f512566850775f02c0a..560f66e4974971b51b2f2d3f66a2b556fe745f5e 100644 (file)
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -546,10 +546,10 @@ static inline void vma_mas_szero(struct ma_state *mas, unsigned long start,
 
 static int vma_link(struct mm_struct *mm, struct vm_area_struct *vma)
 {
-       MA_STATE(mas, &mm->mm_mt, 0, 0);
+       VMA_ITERATOR(vmi, mm, 0);
        struct address_space *mapping = NULL;
 
-       if (mas_preallocate(&mas, vma, GFP_KERNEL))
+       if (vma_iter_prealloc(&vmi, vma))
                return -ENOMEM;
 
        if (vma->vm_file) {
@@ -557,7 +557,7 @@ static int vma_link(struct mm_struct *mm, struct vm_area_struct *vma)
                i_mmap_lock_write(mapping);
        }
 
-       vma_mas_store(vma, &mas);
+       vma_iter_store(&vmi, vma);
 
        if (mapping) {
                __vma_link_file(vma, mapping);