Commit 6af5fa0d authored by Liu Song's avatar Liu Song Committed by Linus Torvalds
Browse files

mm/mprotect.c: avoid repeated assignment in do_mprotect_pkey() 

After adjustment, the repeated assignment of "prev" is avoided, and the
readability of the code is improved.

Link: https://lkml.kernel.org/r/20211012152444.4127-1-fishland@aliyun.com


Reviewed-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLiu Song <liu.song11@zte.com.cn>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e26e0cc3

mm/mprotect.c

+4 −1
Original line number Diff line number Diff line
@@ -563,7 +563,7 @@ static int do_mprotect_pkey(unsigned long start, size_t len, 
	error = -ENOMEM;

	if (!vma)

		goto out;

	prev = vma->vm_prev;



	if (unlikely(grows & PROT_GROWSDOWN)) {

		if (vma->vm_start >= end)

			goto out;
@@ -581,8 +581,11 @@ static int do_mprotect_pkey(unsigned long start, size_t len, 
				goto out;

		}

	}



	if (start > vma->vm_start)

		prev = vma;

	else

		prev = vma->vm_prev;



	for (nstart = start ; ; ) {

		unsigned long mask_off_old_flags;