[081/173] mm/mprotect.c: optimize error detection in do_mprotect_pkey()

Commit Message

Andrew Morton Feb. 24, 2021, 8:04 p.m. UTC

From: Tianjia Zhang <[e-mail]>
Subject: mm/mprotect.c: optimize error detection in do_mprotect_pkey()

Obviously, the error variable detection of the if statement is
for the mprotect callback function, so it is also put into the
scope of calling callbck.

This is a cleanup which makes this site consistent with the rest of this
function's error handling.

Link: https://lkml.kernel.org/r/[e-mail]
Signed-off-by: Tianjia Zhang <[e-mail]>
Reported-by: Jia Zhang <[e-mail]>
Reviewed-by: Andrew Morton <[e-mail]>
Cc: Jarkko Sakkinen <[e-mail]>
Signed-off-by: Andrew Morton <[e-mail]>
---

 mm/mprotect.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

Patch

--- a/mm/mprotect.c~mm-optimizing-error-condition-detection-in-do_mprotect_pkey
+++ a/mm/mprotect.c
@@ -617,10 +617,11 @@  static int do_mprotect_pkey(unsigned lon
 		if (tmp > end)
 			tmp = end;
 
-		if (vma->vm_ops && vma->vm_ops->mprotect)
+		if (vma->vm_ops && vma->vm_ops->mprotect) {
 			error = vma->vm_ops->mprotect(vma, nstart, tmp, newflags);
-		if (error)
-			goto out;
+			if (error)
+				goto out;
+		}
 
 		error = mprotect_fixup(vma, &prev, nstart, tmp, newflags);
 		if (error)