public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

mm/mmap/vma_merge: rename adj_next to adj_start

Browse source 
The variable 'adj_next' holds the value by which we adjust vm_start of a
vma in variable 'adjust', that's either 'next' or 'mid', so the current
name is inaccurate.  Rename it to 'adj_start'.

Link: https://lkml.kernel.org/r/20230309111258.24079-8-vbabka@suse.cz
Signed-off-by: Vlastimil Babka <vbabka@suse.cz>
Reviewed-by: Liam R. Howlett <Liam.Howlett@oracle.com>
Cc: Lorenzo Stoakes <lstoakes@gmail.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Suren Baghdasaryan <surenb@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Vlastimil Babka 2023-03-09 12:12:55 +01:00 • committed by Andrew Morton
parent 9e8a39d2a9
commit 1e76454f93
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
mm/mmap.c
View file

@ -904,7 +904,7 @@ struct vm_area_struct *vma_merge(struct vma_iterator *vmi, struct mm_struct *mm,
bool vma_expanded = false;
struct vma_prepare vp;
unsigned long vma_end = end;
long adj_next = 0;
long adj_start = 0;
unsigned long vma_start = addr;
validate_mm(mm);
@ -973,7 +973,7 @@ struct vm_area_struct *vma_merge(struct vma_iterator *vmi, struct mm_struct *mm,
remove = mid;
} else { /* case 5 */
adjust = mid;
adj_next = (end - mid->vm_start);
adj_start = (end - mid->vm_start);
}
}
} else if (merge_next) {
@ -981,7 +981,7 @@ struct vm_area_struct *vma_merge(struct vma_iterator *vmi, struct mm_struct *mm,
if (prev && addr < prev->vm_end) { /* case 4 */
vma_end = addr;
adjust = next;
adj_next = -(prev->vm_end - addr);
adj_start = -(prev->vm_end - addr);
err = dup_anon_vma(next, prev);
} else {
vma = next; /* case 3 */
@ -1004,7 +1004,7 @@ struct vm_area_struct *vma_merge(struct vma_iterator *vmi, struct mm_struct *mm,
if (vma_iter_prealloc(vmi))
return NULL;
vma_adjust_trans_huge(vma, vma_start, vma_end, adj_next);
vma_adjust_trans_huge(vma, vma_start, vma_end, adj_start);
init_multi_vma_prep(&vp, vma, adjust, remove, remove2);
VM_WARN_ON(vp.anon_vma && adjust && adjust->anon_vma &&
vp.anon_vma != adjust->anon_vma);
@ -1020,10 +1020,10 @@ struct vm_area_struct *vma_merge(struct vma_iterator *vmi, struct mm_struct *mm,
if (vma_expanded)
vma_iter_store(vmi, vma);
if (adj_next) {
adjust->vm_start += adj_next;
adjust->vm_pgoff += adj_next >> PAGE_SHIFT;
if (adj_next < 0) {
if (adj_start) {
adjust->vm_start += adj_start;
adjust->vm_pgoff += adj_start >> PAGE_SHIFT;
if (adj_start < 0) {
WARN_ON(vma_expanded);
vma_iter_store(vmi, next);
}