From nobody Sun Feb 8 02:21:41 2026 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0546717D2 for ; Tue, 7 Oct 2025 22:27:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759876057; cv=none; b=C1DwEWc0cKltHhodznFyXUdJ1E06bi77+upR/MArklAob4JYZHm6vwSn/D9yhN+YVXfD59ZR70/TBejA8Srp8EsK7GBoCQViH2cgIS4dmQYfJ1KrqnEzJQoMHS0DuyzCwpXABWXOv34L0RtggRI2Z7z73yH2chgevRPuMZ8UEmM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759876057; c=relaxed/simple; bh=boDfZUYJ+H6634/MALrOlMiRqYNUMI2ix73TsdhnqKI=; h=Date:Mime-Version:Message-ID:Subject:From:To:Cc:Content-Type; b=me+HmtnRFAu+aJPeP9ro8WQ11iR+CPSdyekCt9J/7zbcWuN9qLdAFAdKEsoRbBt4S9si4/m8NfHhoQu3+Nnt25SLX9186/WK66zdNaTfvYcOgzwLbLfnrP1V8q5BXvzyGOAe2ZkjeJKsZ6/F2uF8+uEnFH9qt3ZCWlpqZZwkelk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=z7Snv7u/; arc=none smtp.client-ip=209.85.216.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="z7Snv7u/" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-32eb18b5659so5852422a91.2 for ; Tue, 07 Oct 2025 15:27:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1759876055; x=1760480855; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:reply-to:from:to:cc :subject:date:message-id:reply-to; bh=nemErtkM3sps/Qprvfk0CxBBJIRtCuUQx5Na0YrmCEY=; b=z7Snv7u/l1acVSCetw/3lPDkwP4oaf6aYqGBYFozwW1KS7PBngo2DJPhVVXZSSeC07 xW2rLmDJGQANChLVQf4qxIVl7EfFMurairvajaAnp9bFV58pMh+K8NqwJZRZnhMXWMbA 4yDr9lodULQOn0KXZJjHobxAGN6RzA11mQrcLDCeH41jCZbEO84wLaQZHGMD/qA7blXL wWfzqybZduJH7CTzeR5URFTOtaJndgyT70KwjKGyMfljsFXOrulsIjt5nYg1xxVbzeA/ 2jH8u+4xAfTV8rAN7QaykNNUfQWMtGbksODDCZq+cMJbnGayFREqVBUUrUo/RirtMKKq if6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759876055; x=1760480855; h=cc:to:from:subject:message-id:mime-version:date:reply-to :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=nemErtkM3sps/Qprvfk0CxBBJIRtCuUQx5Na0YrmCEY=; b=czLZfUq3F+wejB1TfJa3nQspLqHsSPL7/cQJ9R2xGDd8w+RYyvM8+PZChvhfzIWWUv 3dpBRTckuvw9Wl5ZxrRAIBWykmXfZ2xliOJjpzTOlc/H62h4s5enph9033aUYbGnaWol 9RcG7PF0KrQIGIsU+/18fj7wNmNPYJws9AlgOEQFPbi7yMcv8VWyBpErzW7LNPJbXmIA WKXmnsF0OC992/ho4FRvdXglSrxAPqy23lWICWmXiyR3607AUt6sM4231JckBLGZ6p+3 ETo9l48lNGs4LZHMLjPNZFb21iGcFjbJFd4QWxaK18K3xL4yHASCFWSsNdQ16bSzdgkn Nzsg== X-Forwarded-Encrypted: i=1; AJvYcCV5Kz3BopEJjb9J/wmzZ2uhk9RKUM/nBr70Yc8WRrZiPlY2tTfronmlnqGL3P9v0qH1SL//qaEbzWxuQUI=@vger.kernel.org X-Gm-Message-State: AOJu0YwVELGHdYC5aI9GsSHcra4g8Kx6YZ8KiJs0Xe880i1a1+V8FvVI q1/jlCl3it1ZBvJ/Y/7YDdvBsXQBoYzG4O72g7U/LX/xQRYU8T5oRjTZRV1iPOpjL+As4jMI0oE OrZt6oA== X-Google-Smtp-Source: AGHT+IHCXMcYKNWSsv61XAkjfnUkhMqw6aPlFj2DkTkT+0UR1Ffi2JkCaAGL8ygnGp6zS6I4Oc5vhHNCMRE= X-Received: from pjbgo20.prod.google.com ([2002:a17:90b:3d4:b0:330:49f5:c0a7]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:3e82:b0:32e:32f8:bf9f with SMTP id 98e67ed59e1d1-33b513841abmr1305469a91.30.1759876055267; Tue, 07 Oct 2025 15:27:35 -0700 (PDT) Reply-To: Sean Christopherson Date: Tue, 7 Oct 2025 15:27:33 -0700 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 X-Mailer: git-send-email 2.51.0.710.ga91ca5db03-goog Message-ID: <20251007222733.349460-1-seanjc@google.com> Subject: [PATCH] KVM: guest_memfd: Drop a superfluous local var in kvm_gmem_fault_user_mapping() From: Sean Christopherson To: Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Sean Christopherson Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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. Signed-off-by: Sean Christopherson Reviewed-by: Ackerley Tng --- virt/kvm/guest_memfd.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/virt/kvm/guest_memfd.c b/virt/kvm/guest_memfd.c index 94bafd6c558c..abbec01d7a3a 100644 --- a/virt/kvm/guest_memfd.c +++ b/virt/kvm/guest_memfd.c @@ -330,12 +330,10 @@ static vm_fault_t kvm_gmem_fault_user_mapping(struct = vm_fault *vmf) =20 folio =3D kvm_gmem_get_folio(inode, vmf->pgoff); if (IS_ERR(folio)) { - int err =3D PTR_ERR(folio); - - if (err =3D=3D -EAGAIN) + if (PTR_ERR(folio) =3D=3D -EAGAIN) return VM_FAULT_RETRY; =20 - return vmf_error(err); + return vmf_error(PTR_ERR(folio)); } =20 if (WARN_ON_ONCE(folio_test_large(folio))) { base-commit: 6b36119b94d0b2bb8cea9d512017efafd461d6ac --=20 2.51.0.710.ga91ca5db03-goog