From nobody Thu Oct 15 01:27:05 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4j4r5p56S1z6w2Gf for ; Thu, 15 Oct 2026 01:27:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4j4r5p3YwQz4d2x for ; Thu, 15 Oct 2026 01:27:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792027630; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WzhAe688PSVx4B0SxkHGFoEhQOEj5oArffg/CUmiQB4=; b=Ooe3MhjIe5Nt9+urhQDrjupdlZPYTaBzGaZa/9Lk8eWpbChpPxdq5WUdLfZXLVFNGqnq85 9jk2wIRmxngowQLjPxbV9mx2ZargskrsXBjqd+zUMIyZkZTN/V9CJX42Nq3dCiBkBesLtG pZ3OZBHGJgMwGU/aOmrGpDso866QHAqwLF4IQUUA/R9za8cBxBT5m7osVjeEZa8oLYyRuh I1CEmLBYlGkm7m92PinaqGmG1mf99tObqVAKJyoZd+I7EB6crB8AMY9fCvpV9P8weUqHjf TJ7bLSOyAe7diXmoiQwiWcRgSTiLShAlpS/bE1XtczRrOhDedKGlCrZT5lY9Ww== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792027630; b=CRcnY35qZPwIcjzErz3CB3xhFh8stf5MC1tpy1YjrJInfdBlMLu2u5lRhOgufewIRWSzcw 7Ndx5M/P3XIGnLpaUcEOUaTOvSShknUMGpEooVJqAyhMX857tGE10kcRcp9ua43GsjKIyA Kb4eVp9IqJ0YLmzuGXv1JBugzBY3kSxCKsdoW3+lmoEtzHx1uPGZEKlPfUyC8RWHhWBnio hzwkMaFFIswHtSHjK7VF0RhByZU4DINXAtZAl1dj3xxihadxSikmvE0HMM47K2tghO/TgD af8/op/+FgK87anfR9VnyzsGt/IRp+VaBpmNQ6kpQTXGp1osX3r5YR3R94Rsmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792027630; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WzhAe688PSVx4B0SxkHGFoEhQOEj5oArffg/CUmiQB4=; b=paxUBixCvTxZt2nXSiYHA3etalVPL5Ak0wgrX0OEkAv6DRA9Xr8QIbFJme+FhhMa0RuU0R zgokfR8wn76c19qHxOk/NDaIv/VlhDgnCa7CNEdxzU/2xSATz9Y6Pl7vuJd6G72m1VuhZk QA860qujuSO7hGG8NeaIP8RbXxUFy6CYv3TaTSlFxBnziV0tUW+t3P0ZEO78qxjO8fAzzp 0Oj6FX/AtUcO9+cAEJwRARL+8wNC10fLtN/LrXFuteDTDrDYPtpNByyT/w9zPdQ09QvkGw TZD5Ow8n0Af9aAZHGgwQhH+nrlrSoAuZIKa8YOq6fDVQ0COvSLQNvCq3mTOfZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4j4r5p2Lv9z1PhP for ; Thu, 15 Oct 2026 01:27:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ce9f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 15 Oct 2026 01:27:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Bren From: Rick Macklem Subject: git: 472a735d09eb - stable/14 - nfs_nfsdsocket.c: Fix "nfsstats -d" for ERELOOKUP List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 472a735d09eb5504d36703b47fbd28afc5b126bb Auto-Submitted: auto-generated Date: Thu, 15 Oct 2026 01:27:05 +0000 Message-Id: <6ad02be9.1ce9f.2e5823a0@gitrepo.freebsd.org> The branch stable/14 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=472a735d09eb5504d36703b47fbd28afc5b126bb commit 472a735d09eb5504d36703b47fbd28afc5b126bb Author: Bren AuthorDate: 2026-10-08 19:03:51 +0000 Commit: Rick Macklem CommitDate: 2026-10-15 01:25:02 +0000 nfs_nfsdsocket.c: Fix "nfsstats -d" for ERELOOKUP When ERELOOKLUP is returned by a file operation (always vop_lookup?) the operation is retried without doing nfsrv_statsend(). This patch fixes this problem, The only effect of the bug was bogus "nfsstat -d" output. PR: 298534 (cherry picked from commit 9a237074d380233e93a17ddee6b155cc2f90ee96) --- sys/fs/nfsserver/nfs_nfsdsocket.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/fs/nfsserver/nfs_nfsdsocket.c b/sys/fs/nfsserver/nfs_nfsdsocket.c index 09ed4c407c13..09384ad6e5bd 100644 --- a/sys/fs/nfsserver/nfs_nfsdsocket.c +++ b/sys/fs/nfsserver/nfs_nfsdsocket.c @@ -652,6 +652,8 @@ tryagain: vn_finished_write(mp); if (error == 0 && nd->nd_repstat == ERELOOKUP) { + nfsrvd_statend(nfsv3to4op[nd->nd_procnum], /*bytes*/ 0, + /*now*/ NULL, /*then*/ &start_time); /* * Roll back to the beginning of the RPC request * arguments. @@ -1353,6 +1355,11 @@ tryagain: } if (nd->nd_repstat == ERELOOKUP) { + if (statsinprog != 0) { + nfsrvd_statend(op, /*bytes*/ 0, /*now*/ NULL, + /*then*/ &start_time); + statsinprog = 0; + } /* * Roll back to the beginning of the operation * arguments.