From: Sean Christopherson <seanjc@google.com>
Date: Tue, 7 Oct 2025 22:27:33 +0000 (-0700)
Subject: KVM: guest_memfd: Drop a superfluous local var in kvm_gmem_fault_user_mapping()
X-Git-Tag: v6.19-rc1~103^2~10^2~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f3e10797ab883e9dcc256f21094f039c2bb3143;p=thirdparty%2Fkernel%2Flinux.git

KVM: guest_memfd: Drop a superfluous local var in kvm_gmem_fault_user_mapping()

Drop the local "int err" that's buried in the middle guest_memfd's user
fault handler to avoid the potential for variable shadowing, e.g. if an
"err" variable were also declared at function scope.

No functional change intended.

Link: https://lore.kernel.org/r/20251007222733.349460-1-seanjc@google.com
Signed-off-by: Sean Christopherson <seanjc@google.com>
---

diff --git a/virt/kvm/guest_memfd.c b/virt/kvm/guest_memfd.c
index 9017e4d77c538..1e4af29159eae 100644
--- a/virt/kvm/guest_memfd.c
+++ b/virt/kvm/guest_memfd.c
@@ -361,12 +361,10 @@ static vm_fault_t kvm_gmem_fault_user_mapping(struct vm_fault *vmf)
 
 	folio = kvm_gmem_get_folio(inode, vmf->pgoff);
 	if (IS_ERR(folio)) {
-		int err = PTR_ERR(folio);
-
-		if (err == -EAGAIN)
+		if (PTR_ERR(folio) == -EAGAIN)
 			return VM_FAULT_RETRY;
 
-		return vmf_error(err);
+		return vmf_error(PTR_ERR(folio));
 	}
 
 	if (WARN_ON_ONCE(folio_test_large(folio))) {