mm/mremap: Use vmi version of vma_merge()

Use the vma iterator so that the iterator can be invalidated or updated
to avoid each caller doing so.

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

diff --git a/mm/mremap.c b/mm/mremap.c
index 841fcc70e017f421b6b835b5c86c17cea5c0a5b0..7302a71058ce377e77b42536b304e43bb69eeca9 100644 (file)
--- a/mm/mremap.c
+++ b/mm/mremap.c
@@ -1017,6 +1017,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
                        unsigned long extension_start = addr + old_len;
                        unsigned long extension_end = addr + new_len;
                        pgoff_t extension_pgoff = vma->vm_pgoff + (old_len >> PAGE_SHIFT);
+                       VMA_ITERATOR(vmi, mm, extension_start);
 
                        if (vma->vm_flags & VM_ACCOUNT) {
                                if (security_vm_enough_memory_mm(mm, pages)) {
@@ -1032,10 +1033,10 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
                         * with the next vma if it becomes adjacent to the expanded vma and
                         * otherwise compatible.
                         */
-                       vma = vma_merge(mm, vma, extension_start, extension_end,
-                                       vma->vm_flags, vma->anon_vma, vma->vm_file,
-                                       extension_pgoff, vma_policy(vma),
-                                       vma->vm_userfaultfd_ctx, anon_vma_name(vma));
+                       vma = vmi_vma_merge(&vmi, mm, vma, extension_start,
+                               extension_end, vma->vm_flags, vma->anon_vma,
+                               vma->vm_file, extension_pgoff, vma_policy(vma),
+                               vma->vm_userfaultfd_ctx, anon_vma_name(vma));
                        if (!vma) {
                                vm_unacct_memory(pages);
                                ret = -ENOMEM;