Commit f4331956 authored by Miaohe Lin's avatar Miaohe Lin Committed by Andrew Morton
Browse files

mm/mremap: use helper mlock_future_check() 

Use helper mlock_future_check() to check whether it's safe to resize the
locked_vm to simplify the code.  Minor readability improvement.

Link: https://lkml.kernel.org/r/20220322112004.27380-1-linmiaohe@huawei.com


Signed-off-by: default avatarMiaohe Lin <linmiaohe@huawei.com>
Reviewed-by: default avatarWei Yang <richard.weiyang@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 3afa7930

mm/mremap.c

+2 −8
Original line number Diff line number Diff line
@@ -766,14 +766,8 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr, 
	if (vma->vm_flags & (VM_DONTEXPAND | VM_PFNMAP))

		return ERR_PTR(-EFAULT);



	if (vma->vm_flags & VM_LOCKED) {

		unsigned long locked, lock_limit;

		locked = mm->locked_vm << PAGE_SHIFT;

		lock_limit = rlimit(RLIMIT_MEMLOCK);

		locked += new_len - old_len;

		if (locked > lock_limit && !capable(CAP_IPC_LOCK))

	if (mlock_future_check(mm, vma->vm_flags, new_len - old_len))

		return ERR_PTR(-EAGAIN);

	}



	if (!may_expand_vm(mm, vma->vm_flags,

				(new_len - old_len) >> PAGE_SHIFT))