From nobody Thu Oct 08 19:06:31 2026 X-Original-To: dev-commits-src-main@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 4j0zxT4Hfyz6w60T for ; Thu, 08 Oct 2026 19:06:37 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4j0zxT2FJ9z4P1W for ; Thu, 08 Oct 2026 19:06:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791486397; 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=BvMoQ7BMvhOdkOVQLeTB/XTgJE29NBUYLOhb8ISGB/M=; b=FRGX6nh9LsNkgyJszAlGWsZnGnd9jOGQQgeCjNcJFbkmLH3VUgTRuJCFuK2KWbDXWZgnUI SMO3a9u96a/g6KNfay9Wn5fSpnkQ0RTLqZadWLfAvUiiDFbXNRmDU0nBbHpfEmcQ45Y1hv 36E5G9IIOK6ivO2qJtCO+WksSFz1ldhR2gh8PyKap2PORHuVxmTfwqDD3cIjTeguMNxynb c6FN01hPme8VogWX1Ic38v73RW5RKLmEcVRtcr/5/zMCUAlECwZ28O81FxD8laSsGBGkAz 1v+jxvEgaXUAclz/qBR2xDKHMfU+vM1mY1glMjkyONwzu+0nnf5BeaVO/OhsDA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791486397; b=rVn2XWk74OukE9KQ/RMjbw9SE+fO3ijrx/Hw//uKjkOEFXj4s1+aEnKUBvuSIj9gGLPSDN drskfWbfoHgGBzwokyrrXFrf4A4gOg0i4STDH9dwjxnoLdJWqhcdWQiovaX7Ilrirs0GHl U5Q5JJXiMLmF6a4SIWtfznq7/LO5HvVmxiUrU1dlkf1XWAdyW5+b6/g7fGZYiOEUZKsCpQ NiaBNviXcf3hL9u6qoQvt12hWNclmZhx6V82cZWVdtkQwL4Rx9TYOC///9EX+webdvBaba OXYDCdvT9FA1hN66RclQEuPOUsrMft7sUtcWpq4w1Eq0h4i7/hWSwQwzCXsGzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791486397; 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=BvMoQ7BMvhOdkOVQLeTB/XTgJE29NBUYLOhb8ISGB/M=; b=PkUJ2t9SXyZcMhRtvOI0jx0A5adsXprHL0ALbKrIhAN1uhyG0mg9OnbsGEyr+yt/Uc1s3L 3xvwTLYVORxPNllVneY6bwblzPcwAX6DE9k7RSElqfaqT+Tavse0n+NK8z/sTC8em02D7e RAijFywl64nmj/k9dBMIHaNQ5dosRttv29DcKzGHImF8s4VBgJlkztdim+oOHJa43VD/sY 7e5L+XekTbv6mg8VNiXKNkFh3FfHDqr5QFPtUfRybxCgcqF7+LFKNcltJ8RZRcaoiVsDkl QpfrZhntq1vXe/9scyczMPg4EW44UGorSAWHPjzrYllK49h0c7WOG0YoEL5aYA== 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 4j0zxT0sN0zs10 for ; Thu, 08 Oct 2026 19:06:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1fc6d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 08 Oct 2026 19:06:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Bren From: Rick Macklem Subject: git: 9a237074d380 - main - nfs_nfsdsocket.c: Fix "nfsstats -d" for ERELOOKUP List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: 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/main X-Git-Reftype: branch X-Git-Commit: 9a237074d380233e93a17ddee6b155cc2f90ee96 Auto-Submitted: auto-generated Date: Thu, 08 Oct 2026 19:06:31 +0000 Message-Id: <6ac7e9b7.1fc6d.3c34c83f@gitrepo.freebsd.org> The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=9a237074d380233e93a17ddee6b155cc2f90ee96 commit 9a237074d380233e93a17ddee6b155cc2f90ee96 Author: Bren AuthorDate: 2026-10-08 19:03:51 +0000 Commit: Rick Macklem CommitDate: 2026-10-08 19:03:51 +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 Reviewed by: rmacklem MFC after: 1 week --- 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 70aa20d4aa04..7061ab86afa0 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.