It sounds safe to do unlock/relock to mmap_sem in mremap, so passing
"false" here.

Signed-off-by: Yang Shi <yang....@linux.alibaba.com>
---
 mm/mremap.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/mm/mremap.c b/mm/mremap.c
index 049470a..5f8fca4 100644
--- a/mm/mremap.c
+++ b/mm/mremap.c
@@ -353,7 +353,7 @@ static unsigned long move_vma(struct vm_area_struct *vma,
        if (unlikely(vma->vm_flags & VM_PFNMAP))
                untrack_pfn_moved(vma);
 
-       if (do_munmap(mm, old_addr, old_len, uf_unmap) < 0) {
+       if (do_munmap(mm, old_addr, old_len, uf_unmap, false) < 0) {
                /* OOM: unable to split vma, just get accounts right */
                vm_unacct_memory(excess >> PAGE_SHIFT);
                excess = 0;
@@ -462,12 +462,13 @@ static unsigned long mremap_to(unsigned long addr, 
unsigned long old_len,
        if (addr + old_len > new_addr && new_addr + new_len > addr)
                goto out;
 
-       ret = do_munmap(mm, new_addr, new_len, uf_unmap_early);
+       ret = do_munmap(mm, new_addr, new_len, uf_unmap_early, false);
        if (ret)
                goto out;
 
        if (old_len >= new_len) {
-               ret = do_munmap(mm, addr+new_len, old_len - new_len, uf_unmap);
+               ret = do_munmap(mm, addr+new_len, old_len - new_len,
+                               uf_unmap, false);
                if (ret && old_len != new_len)
                        goto out;
                old_len = new_len;
@@ -568,7 +569,8 @@ static int vma_expandable(struct vm_area_struct *vma, 
unsigned long delta)
         * do_munmap does all the needed commit accounting
         */
        if (old_len >= new_len) {
-               ret = do_munmap(mm, addr+new_len, old_len - new_len, &uf_unmap);
+               ret = do_munmap(mm, addr+new_len, old_len - new_len,
+                               &uf_unmap, false);
                if (ret && old_len != new_len)
                        goto out;
                ret = addr;
-- 
1.8.3.1

Reply via email to