]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
KVM: guest_memfd: Drop a superfluous local var in kvm_gmem_fault_user_mapping()
authorSean Christopherson <seanjc@google.com>
Tue, 7 Oct 2025 22:27:33 +0000 (15:27 -0700)
committerSean Christopherson <seanjc@google.com>
Mon, 20 Oct 2025 13:30:29 +0000 (06:30 -0700)
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>
virt/kvm/guest_memfd.c

index 9017e4d77c53826a99086f82e523b560865555b4..1e4af29159eae51769b99f9b9b0c778a60a94e4f 100644 (file)
@@ -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))) {