Commit cfea8921 authored by Lorenzo Stoakes's avatar Lorenzo Stoakes Committed by Andrew Morton
Browse files

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: default avatarLorenzo Stoakes <lorenzo.stoakes@oracle.com>
Reviewed-by: default avatarVlastimil Babka <vbabka@suse.cz>
Acked-by: default avatarDavid Hildenbrand <david@redhat.com>
Reviewed-by: default avatarLiam R. Howlett <Liam.Howlett@oracle.com>
Cc: Jann Horn <jannh@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 3865301d

mm/madvise.c

+4 −4
Original line number Diff line number Diff line
@@ -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);

mm/vma.c

+1 −3
Original line number Diff line number Diff line
@@ -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);

mm/vma.h

+7 −8
Original line number Diff line number Diff line
@@ -290,14 +290,13 @@ __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,

*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);



/* We are about to modify the VMA's memory policy. */