Commit 0c0c5bff authored by Liam R. Howlett's avatar Liam R. Howlett Committed by Andrew Morton
Browse files

mmap: pass through vmi iterator to __split_vma() 

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

Link: https://lkml.kernel.org/r/20230120162650.984577-25-Liam.Howlett@oracle.com


Signed-off-by: default avatarLiam R. Howlett <Liam.Howlett@oracle.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 178e22ac

mm/mmap.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -2388,7 +2388,7 @@ do_vmi_align_munmap(struct vma_iterator *vmi, struct vm_area_struct *vma, 
		if (end < vma->vm_end && mm->map_count >= sysctl_max_map_count)

		if (end < vma->vm_end && mm->map_count >= sysctl_max_map_count)

			goto map_count_exceeded;

			goto map_count_exceeded;





		error = __split_vma(mm, vma, start, 0);

		error = vmi__split_vma(vmi, mm, vma, start, 0);

		if (error)

		if (error)

			goto start_split_failed;

			goto start_split_failed;
@@ -2409,7 +2409,7 @@ do_vmi_align_munmap(struct vma_iterator *vmi, struct vm_area_struct *vma, 
		if (next->vm_end > end) {

		if (next->vm_end > end) {

			struct vm_area_struct *split;

			struct vm_area_struct *split;





			error = __split_vma(mm, next, end, 1);

			error = vmi__split_vma(vmi, mm, next, end, 1);

			if (error)

			if (error)

				goto end_split_failed;

				goto end_split_failed;