From 14a9febc7ca7aaff6ba907923dcaad7eb41be265 Mon Sep 17 00:00:00 2001 From: "Liam R. Howlett" Date: Mon, 4 Jan 2021 13:55:29 -0500 Subject: [PATCH] mm/mmap: Convert __insert_vm_struct to use mas, convert vma_link to use vma_mas_link() Drop unused vma_store() Signed-off-by: Liam R. Howlett --- mm/mmap.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index 11eed8717082..98609612c47e 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -523,21 +523,9 @@ static void vma_mas_link(struct mm_struct *mm, struct vm_area_struct *vma, static void vma_link(struct mm_struct *mm, struct vm_area_struct *vma) { - struct address_space *mapping = NULL; - - if (vma->vm_file) { - mapping = vma->vm_file->f_mapping; - i_mmap_lock_write(mapping); - } - - vma_mt_store(mm, vma); - __vma_link_file(vma); + MA_STATE(mas, &mm->mm_mt, vma->vm_start, vma->vm_end - 1); - if (mapping) - i_mmap_unlock_write(mapping); - - mm->map_count++; - validate_mm(mm); + vma_mas_link(mm, vma, &mas); } /* @@ -547,8 +535,12 @@ static void vma_link(struct mm_struct *mm, struct vm_area_struct *vma) static inline void __insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma) { - BUG_ON(find_vma_intersection(mm, vma->vm_start, vma->vm_end)); - vma_mt_store(mm, vma); + MA_STATE(mas, &mm->mm_mt, vma->vm_start, vma->vm_end - 1); + + BUG_ON(mas_find(&mas, vma->vm_end - 1)); + + mas_set_range(&mas, vma->vm_start, vma->vm_end - 1); + vma_mas_store(vma, &mas); mm->map_count++; } -- 2.49.0