mm/mremap: Use vma_next() instead of vma linked list

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

diff --git a/mm/mremap.c b/mm/mremap.c
index 160ec0d054659e0791f8f811c5e20fc5a59dfac2..bcfdabab4ab908075dd18c43ec3fad9c33fcb771 100644 (file)
--- a/mm/mremap.c
+++ b/mm/mremap.c
@@ -701,7 +701,7 @@ static unsigned long move_vma(struct vm_area_struct *vma,
        if (excess) {
                vma->vm_flags |= VM_ACCOUNT;
                if (split)
-                       vma->vm_next->vm_flags |= VM_ACCOUNT;
+                       vma_next(mm, vma)->vm_flags |= VM_ACCOUNT;
        }
 
        return new_addr;
@@ -875,9 +875,11 @@ out:
 static int vma_expandable(struct vm_area_struct *vma, unsigned long delta)
 {
        unsigned long end = vma->vm_end + delta;
+       struct vm_area_struct *next;
        if (end < vma->vm_end) /* overflow */
                return 0;
-       if (vma->vm_next && vma->vm_next->vm_start < end) /* intersection */
+       next = vma_next(vma->vm_mm, vma);
+       if (next && next->vm_start < end) /* intersection */
                return 0;
        if (get_unmapped_area(NULL, vma->vm_start, end - vma->vm_start,
                              0, MAP_FIXED) & ~PAGE_MASK)