mirror of
https://gitee.com/bianbu-linux/linux-6.6
synced 2025-04-24 14:07:52 -04:00
mm: add vma iterator to vma_adjust() arguments
Change the vma_adjust() function definition to accept the vma iterator and pass it through to __vma_adjust(). Update fs/exec to use the new vma_adjust() function parameters. Update mm/mremap to use the new vma_adjust() function parameters. Revert the __split_vma() calls back from __vma_adjust() to vma_adjust() and pass through the vma iterator. Link: https://lkml.kernel.org/r/20230120162650.984577-37-Liam.Howlett@oracle.com Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
parent
0fd5a9e2b0
commit
b373037fa9
4 changed files with 15 additions and 19 deletions
11
fs/exec.c
11
fs/exec.c
|
@ -699,7 +699,7 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
|
|||
/*
|
||||
* cover the whole range: [new_start, old_end)
|
||||
*/
|
||||
if (vma_adjust(vma, new_start, old_end, vma->vm_pgoff, NULL))
|
||||
if (vma_adjust(&vmi, vma, new_start, old_end, vma->vm_pgoff, NULL))
|
||||
return -ENOMEM;
|
||||
|
||||
/*
|
||||
|
@ -731,12 +731,9 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
|
|||
}
|
||||
tlb_finish_mmu(&tlb);
|
||||
|
||||
/*
|
||||
* Shrink the vma to just the new range. Always succeeds.
|
||||
*/
|
||||
vma_adjust(vma, new_start, new_end, vma->vm_pgoff, NULL);
|
||||
|
||||
return 0;
|
||||
vma_prev(&vmi);
|
||||
/* Shrink the vma to just the new range */
|
||||
return vma_adjust(&vmi, vma, new_start, new_end, vma->vm_pgoff, NULL);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue