]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
mm: Remove unnecessary write to vma iterator in __vma_adjust()
authorLiam Howlett <Liam.Howlett@oracle.com>
Mon, 14 Nov 2022 16:08:16 +0000 (11:08 -0500)
committerLiam Howlett <Liam.Howlett@oracle.com>
Mon, 14 Nov 2022 19:57:07 +0000 (14:57 -0500)
If the vma start address is going to change due to an insert, then it is
safe to not write the vma to the tree.  The write of the insert vma will
alter the tree as necessary.

Signed-off-by: Liam Howlett <Liam.Howlett@oracle.com>
mm/mmap.c

index 0e6f0705d81a55e6c59c3a9bcbcdaea254869e73..07849eb492e0b3a133dfd84990de5ed0d6e0eaf9 100644 (file)
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -705,10 +705,12 @@ int __vma_adjust(struct vma_iterator *vmi, struct vm_area_struct *vma,
        }
 
        if (start != vma->vm_start) {
-               if ((vma->vm_start < start) &&
-                   (!insert || (insert->vm_end != start))) {
-                       vma_iter_clear(vmi, vma->vm_start, start);
-                       VM_WARN_ON(insert && insert->vm_start > vma->vm_start);
+               if (vma->vm_start < start) {
+                       if (!insert || (insert->vm_end != start)) {
+                               vma_iter_clear(vmi, vma->vm_start, start);
+                               vma_iter_set(vmi, start);
+                               VM_WARN_ON(insert && insert->vm_start > vma->vm_start);
+                       }
                } else {
                        vma_changed = true;
                }