| Message ID | 20210408033548.krdk4xneump6a7d3@monty (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | mm/mmap.c: lines in __do_munmap repeat logic of inlined find_vma_intersection | expand |
diff --git a/mm/mmap.c b/mm/mmap.c index 3f287599a7a3..1b29f8bf8344 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -2823,15 +2823,10 @@ int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len, arch_unmap(mm, start, end); /* Find the first overlapping VMA */ - vma = find_vma(mm, start); + vma = find_vma_intersecion(mm, start, end); if (!vma) return 0; prev = vma->vm_prev; - /* we have start < vma->vm_end */ - - /* if it doesn't overlap, we have nothing.. */ - if (vma->vm_start >= end) - return 0; /* * If we need to split any vma, do it now to save pain later.
Some lines in __do_munmap used the same logic as find_vma_intersection (which is inlined) instead of directly using that function. Signed-off-by: Gonzalo Matias Juarez Tello <gmjuareztello@gmail.com> --- mm/mmap.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)