mm/vma: refactor vma_modify_flags_name() to vma_modify_name()

The single instance in which we use this function doesn't actually need to
change VMA flags, so remove this parameter and update the caller
accordingly.

[lorenzo.stoakes@oracle.com: correct comment]
Link: https://lkml.kernel.org/r/77f45b2e-a748-4635-9381-a5051091087f@lucifer.local
Link: https://lkml.kernel.org/r/20250714135839.178032-1-lorenzo.stoakes@oracle.com
Signed-off-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
Reviewed-by: Vlastimil Babka <vbabka@suse.cz>
Acked-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Liam R. Howlett <Liam.Howlett@oracle.com>
Cc: Jann Horn <jannh@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/mm/madvise.c b/mm/madvise.c
index 1c30031ab035791b252baf7df3fdde4fa2632bb8..2bf80989d5b6541f46e76b219204103c3e2004f1 100644 (file)
--- a/mm/madvise.c
+++ b/mm/madvise.c
@@ -144,8 +144,8 @@ static int replace_anon_vma_name(struct vm_area_struct *vma,
 }
 #endif /* CONFIG_ANON_VMA_NAME */
 /*
- * Update the vm_flags and/or anon_name on region of a vma, splitting it or
- * merging it as necessary. Must be called with mmap_lock held for writing.
+ * Update the vm_flags or anon_name on region of a vma, splitting it or merging
+ * it as necessary. Must be called with mmap_lock held for writing.
  */
 static int madvise_update_vma(vm_flags_t new_flags,
                struct madvise_behavior *madv_behavior)
@@ -161,8 +161,8 @@ static int madvise_update_vma(vm_flags_t new_flags,
                return 0;
 
        if (set_new_anon_name)
-               vma = vma_modify_flags_name(&vmi, madv_behavior->prev, vma,
-                       range->start, range->end, new_flags, anon_name);
+               vma = vma_modify_name(&vmi, madv_behavior->prev, vma,
+                       range->start, range->end, anon_name);
        else
                vma = vma_modify_flags(&vmi, madv_behavior->prev, vma,
                        range->start, range->end, new_flags);

diff --git a/mm/vma.c b/mm/vma.c
index b3d8806523594f91126d53038d4464c9622055ba..fc502b741dcf876243c99398bb3094c7b7981b9e 100644 (file)
--- a/mm/vma.c
+++ b/mm/vma.c
@@ -1650,17 +1650,15 @@ struct vm_area_struct *vma_modify_flags(
 }
 
 struct vm_area_struct
-*vma_modify_flags_name(struct vma_iterator *vmi,
+*vma_modify_name(struct vma_iterator *vmi,
                       struct vm_area_struct *prev,
                       struct vm_area_struct *vma,
                       unsigned long start,
                       unsigned long end,
-                      vm_flags_t vm_flags,
                       struct anon_vma_name *new_name)
 {
        VMG_VMA_STATE(vmg, vmi, prev, vma, start, end);
 
-       vmg.vm_flags = vm_flags;
        vmg.anon_name = new_name;
 
        return vma_modify(&vmg);

diff --git a/mm/vma.h b/mm/vma.h
index cf6e3a6371b6c76ea0400d6f1bbcfa0187707c91..acdcc515c459d5722289077a1a15766afc635810 100644 (file)
--- a/mm/vma.h
+++ b/mm/vma.h
@@ -290,15 +290,14 @@ __must_check struct vm_area_struct
                unsigned long start, unsigned long end,
                vm_flags_t vm_flags);
 
-/* We are about to modify the VMA's flags and/or anon_name. */
+/* We are about to modify the VMA's anon_name. */
 __must_check struct vm_area_struct
-*vma_modify_flags_name(struct vma_iterator *vmi,
-                      struct vm_area_struct *prev,
-                      struct vm_area_struct *vma,
-                      unsigned long start,
-                      unsigned long end,
-                      vm_flags_t vm_flags,
-                      struct anon_vma_name *new_name);
+*vma_modify_name(struct vma_iterator *vmi,
+                struct vm_area_struct *prev,
+                struct vm_area_struct *vma,
+                unsigned long start,
+                unsigned long end,
+                struct anon_vma_name *new_name);
 
 /* We are about to modify the VMA's memory policy. */
 __must_check struct vm_area_struct