From nobody Thu Oct 15 01:22:24 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 4j4r0Q4TYDz6w1hR for ; Thu, 15 Oct 2026 01:22:30 +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 4j4r0Q1QvRz4cdM for ; Thu, 15 Oct 2026 01:22:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792027350; 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=Aoo0MI6lcgAVeou/mq2L30B7ClRjyaJXD9VjuyHeXtg=; b=ACDg/18ZeU6SNFuANJ+wKD/Pu4hBXmSbPJZSJxJW/Qa5ITEgveOyN91vEW/PgfVhrSUqJN JKMsY/3jDEkon9PluzQqXqbiKCOySIMi5WT9duVXYx/y5uB4Mo+F8sUVYkFLvu8hpbZp19 0Q901I3wBCdHKL1K1Bx9TUjn9AExDSWl+9RLQi2adNjqWU9HMF8UmDx4o6FgSURKsiPcEu xNwO46uAhIMz+yoWuTTcUS64eRnV2grFPiiUX/SJHXp3T7Sdyg9nI+4lnhu88tojzfmpcr rHOyTOOEYeQ4hL01S776bnlCNDNpP2hg4uP17WtAeuZx+ADwNdGYxyk+bWkuRQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792027350; b=cl+51SDhnea7QF7jfqThVMteg8sNtSvPOTjPEopbgIZR8NmbOHvU5dL8WhlhRleKgm4wmR NAN7D0l4Dl/cbmj2ErzOpV5aLd5Dm4bRbIv8p1iD8oj281B3yxg+TrXv7IfuXCCwtQ05yO LcGNV8A0fKdOVN2xIFuv9o5xGXsZJT+vLESIbXY5IGQxjvn4hPS/4mftn724/CNE25NGsK FOsDwUEmIdRa2bU5D9aMDc2lS9Qg6TCsgMTV1BL+LMbpj3ORCfCpmI2zCkDJexTp+uGrcW JqIFsUOWyyndPmiSTneXv4kBw+FfERuDzD0uAC9TqlRTXr5JmJiHAlvJXxSrhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792027350; 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=Aoo0MI6lcgAVeou/mq2L30B7ClRjyaJXD9VjuyHeXtg=; b=tfi/8RH39zpawRaa5+CQe8hXhZZDl4xFObDtWviEG5eZA0xsRrvj1fLIc14uEDXaz6YaWU LIqUwa8PeAQxCg3N7fXbHcPYHeE5jxLZFikoj81iIq392D5yYn8j+Rt87YW7L8aYW7EM0k 2mgA2sCDU2GbVCOQZZ/i5GGjmNf2hISWUOqjvCNaWbWmIYN5AOBXzd0Evxy6Cqpdzs9/Gp D/JCSg/B5h0RZ/lglO0JsMKS7XqlT0g5hwwgtO6eraCgPVBJX/R4XxOUKQ3o+Ll6ySdnNS luUPGnqxSVG1vxCqi5Mze8SHVNkAYCK/ScgNHF2sceF6rrkZ6us2TZC+0HnAVQ== 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 4j4r0Q0Vntz1QbN for ; Thu, 15 Oct 2026 01:22:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c2dc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 15 Oct 2026 01:22:24 +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: e4a203a17fde - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: e4a203a17fde3ccafd99316932d29224fc5cd3c4 Auto-Submitted: auto-generated Date: Thu, 15 Oct 2026 01:22:24 +0000 Message-Id: <6ad02ad0.1c2dc.5cb839e1@gitrepo.freebsd.org> The branch stable/15 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=e4a203a17fde3ccafd99316932d29224fc5cd3c4 commit e4a203a17fde3ccafd99316932d29224fc5cd3c4 Author: Bren AuthorDate: 2026-10-08 19:03:51 +0000 Commit: Rick Macklem CommitDate: 2026-10-15 01:20:14 +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 932c8d31ba59..fb970d47f10a 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.