From 4b7a90a48b9999c33e06dcce067a2d1540df0703 Mon Sep 17 00:00:00 2001 From: Lorenzo Stoakes Date: Fri, 10 Jul 2026 21:16:49 +0100 Subject: mm/rmap: rename vma_interval_tree_*() to mapping_rmap_tree_*() The family of vma_interval_tree_() functions manipulate the address_space (which, of course, is generally referred to as 'mapping') reverse mapping, but are named the 'VMA' interval tree. VMAs may be mapped by an anon_vma, an address_space, or both. Therefore calling the mapping interval tree a 'VMA' interval tree is rather confusing. This is also inconsistent with the anon_vma_interval_tree_*() functions which explicitly reference the rmap object to which they pertain. Rename the vma_interval_tree_*() functions to mapping_rmap_tree_*() to correct this. We will rename the anon rmap functions similarly in a subsequent patch. No functional change intended. Link: https://lore.kernel.org/20260710-b4-pre-scalable-cow-v2-8-2a5aa403d977@kernel.org Signed-off-by: Lorenzo Stoakes Reviewed-by: Gregory Price Reviewed-by: Vlastimil Babka (SUSE) Reviewed-by: Zi Yan Cc: Ackerley Tng Cc: David Hildenbrand (Arm) Cc: Kai Huang Cc: Marek Szyprowski Cc: Pedro Falcato Cc: SJ Park Cc: Thomas Zimmermann Cc: Liam R. Howlett (Oracle) Signed-off-by: Andrew Morton --- include/linux/mm.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'include/linux') diff --git a/include/linux/mm.h b/include/linux/mm.h index 349d59a737eb..38132060ac58 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -4094,24 +4094,24 @@ extern atomic_long_t mmap_pages_allocated; extern int nommu_shrink_inode_mappings(struct inode *, size_t, size_t); /* interval_tree.c */ -void vma_interval_tree_insert(struct vm_area_struct *vma, +void mapping_rmap_tree_insert(struct vm_area_struct *vma, struct address_space *mapping); -void vma_interval_tree_insert_after(struct vm_area_struct *vma, +void mapping_rmap_tree_insert_after(struct vm_area_struct *vma, struct vm_area_struct *prev, struct address_space *mapping); -void vma_interval_tree_remove(struct vm_area_struct *vma, +void mapping_rmap_tree_remove(struct vm_area_struct *vma, struct address_space *mapping); struct vm_area_struct * -vma_interval_tree_iter_first(struct address_space *mapping, +mapping_rmap_tree_iter_first(struct address_space *mapping, pgoff_t pgoff_start, pgoff_t pgoff_last); struct vm_area_struct * -vma_interval_tree_iter_next(struct vm_area_struct *vma, +mapping_rmap_tree_iter_next(struct vm_area_struct *vma, pgoff_t pgoff_start, pgoff_t pgoff_last); -#define vma_interval_tree_foreach(vma, mapping, pgoff_start, pgoff_last) \ - for (vma = vma_interval_tree_iter_first(mapping, pgoff_start, \ +#define mapping_rmap_tree_foreach(vma, mapping, pgoff_start, pgoff_last) \ + for (vma = mapping_rmap_tree_iter_first(mapping, pgoff_start, \ pgoff_last); \ - vma; vma = vma_interval_tree_iter_next(vma, pgoff_start, \ + vma; vma = mapping_rmap_tree_iter_next(vma, pgoff_start, \ pgoff_last)) void anon_vma_interval_tree_insert(struct anon_vma_chain *node, -- cgit v1.2.3