Skip to content

Commit

Permalink
mm/mmap: Drop range_has_overlap() function
Browse files Browse the repository at this point in the history
Since there is no longer a linked list, the range_has_overlap() function
is identical to the find_vma_intersection() function.

Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
  • Loading branch information
Liam R. Howlett authored and Liam R. Howlett committed Feb 20, 2022
1 parent b3d7ba3 commit b5bd18d
Showing 1 changed file with 1 addition and 27 deletions.
28 changes: 1 addition & 27 deletions mm/mmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -432,30 +432,6 @@ anon_vma_interval_tree_post_update_vma(struct vm_area_struct *vma)
anon_vma_interval_tree_insert(avc, &avc->anon_vma->rb_root);
}

/*
* range_has_overlap() - Check the @start - @end range for overlapping VMAs and
* sets up a pointer to the previous VMA
* @mm: the mm struct
* @start: the start address of the range
* @end: the end address of the range
* @pprev: the pointer to the pointer of the previous VMA
*
* Returns: True if there is an overlapping VMA, false otherwise
*/
static inline
bool range_has_overlap(struct mm_struct *mm, unsigned long start,
unsigned long end, struct vm_area_struct **pprev)
{
struct vm_area_struct *existing;

MA_STATE(mas, &mm->mm_mt, start, start);
rcu_read_lock();
existing = mas_find(&mas, end - 1);
*pprev = mas_prev(&mas, 0);
rcu_read_unlock();
return existing ? true : false;
}

static unsigned long count_vma_pages_range(struct mm_struct *mm,
unsigned long addr, unsigned long end)
{
Expand Down Expand Up @@ -3206,9 +3182,7 @@ void exit_mmap(struct mm_struct *mm)
*/
int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
{
struct vm_area_struct *prev;

if (range_has_overlap(mm, vma->vm_start, vma->vm_end, &prev))
if (find_vma_intersection(mm, vma->vm_start, vma->vm_end))
return -ENOMEM;

if ((vma->vm_flags & VM_ACCOUNT) &&
Expand Down

0 comments on commit b5bd18d

Please sign in to comment.