From nobody Sat Jul 25 01:31:50 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 4h6S5312Dwz6lc6l for ; Sat, 25 Jul 2026 01:31:51 +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 4h6S525n3Zz3MKD for ; Sat, 25 Jul 2026 01:31:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784943110; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tvEZ9gEok7l0TBsHzUQl6z4HjopOVDJ2hZxDlDg1mK8=; b=GCLL/Vh/pk5wk25DI9y73DQkt9L997iFtFr0O3uYZkd6xzVJIz2bK0bkk7KQvohXaVuHZe u2tepBg6F9pfEMcGAMCi0p4KsJBeHsqHrizuRftUrp6eV6FlqG7A0N/inDJWhBxEsSI+tP pC5ij4MHaMx3/YbsWzUBg8g6ne6DIbLHXvHgOtz7L+PwIH2CtOC32lbXRrbu1llSYxYNkF suHh+x/T+aOHMAMuWBO2Eqqck3xdmBlREeV8ARl4JVBveYKEZHtyyip27x0lmMOenFqh3C 2KkxL5Z6JCYswo4S+Oh7fLC44j3IryXWWeqINT214Bh+yxJJnpvmvcu4HA+p1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784943110; a=rsa-sha256; cv=none; b=ovEE93ibaFsegjQgP0XkK4TXRpUy8hgrUF/lQSGma0uImTGUFmgRtgLicKeaiZZDxnODSa c5cyloBZLBa2esyC+31fZEKJimZv02oIwQz0XZS5TSmti1IBnpJhcTuNpS+6Ha6z7sTMNg BeYKNkptQMVxrCZLSs6TbMZSdYy+584Tuk1MJ9pBu/kdh7sLqzPCu9iEgG0wFKiRULX1qk 5cpGpjWjPuWAFdh7C6iN6lxMWZZJCx5b+lLlDBS8XakQ+j8uiYhNr2A559uxX+9YTEFEt/ rBKq8VpTpARqR38mbb+yN+9iOd2jjP8MfO0nlyOb7OgCMvVWiCRUvdiKAC0aXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784943110; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tvEZ9gEok7l0TBsHzUQl6z4HjopOVDJ2hZxDlDg1mK8=; b=mPIQumvGVwvzLsjAZy5LNG3SrXGB4bV2FS7OnshArP13SS4mcU4Z5dPSHI42sD9dSOtOUt OBQeZfyTpLYpzdsaeXZmBhs4h01Y5tgzywBTj8MP/58dkvKgjd9AlrTk09hk13eqg9KEQS 0xjiDwA/P6OtgMJSlHS3pzAT8k5sbHfQxp1rlgxnFAlUnVznrd4MyySt8AhX+KHbf3eJog 5n0HedgXX7f60yJCQRhlTft8XeBQui4Ke1MuaY9Bw5GSe+T1vcoD+Ik8RVeihOQcHZrknc KQ3QRQ7YYux5V4hrLlotxj3AisJay/85+OR1BuMlUEtiL3OYbCE9+9v1fHj3kA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h6S524Y04z223 for ; Sat, 25 Jul 2026 01:31:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34517 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 25 Jul 2026 01:31:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 8200466be682 - stable/14 - nfsd: Commit missing patches for c52bcd09c2a6 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 8200466be6829ebbafa3ba64f623352e58fb28d3 Auto-Submitted: auto-generated Date: Sat, 25 Jul 2026 01:31:50 +0000 Message-Id: <6a641206.34517.7adc209f@gitrepo.freebsd.org> The branch stable/14 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=8200466be6829ebbafa3ba64f623352e58fb28d3 commit 8200466be6829ebbafa3ba64f623352e58fb28d3 Author: Rick Macklem AuthorDate: 2026-07-11 19:30:51 +0000 Commit: Rick Macklem CommitDate: 2026-07-25 01:30:40 +0000 nfsd: Commit missing patches for c52bcd09c2a6 Oops, I missed the other files for the commit. This should fix the build. Pointy hat goes on me. (cherry picked from commit 30d4d3db431a5df8084048c4d31e98e74d2f225a) --- sys/fs/nfs/nfs_var.h | 1 + sys/fs/nfsserver/nfs_nfsdsocket.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/fs/nfs/nfs_var.h b/sys/fs/nfs/nfs_var.h index bcb0588ef012..7c62c7b32c16 100644 --- a/sys/fs/nfs/nfs_var.h +++ b/sys/fs/nfs/nfs_var.h @@ -169,6 +169,7 @@ int nfsrv_mdscopymr(char *, char *, char *, char *, int *, char *, NFSPROC_T *, struct vnode **, struct vnode **, struct pnfsdsfile **, struct nfsdevice **, struct nfsdevice **); void nfsrv_marknospc(char *, bool); +void nfsrv_freestrandedstate(struct nfsrvfh *); /* nfs_nfsdserv.c */ int nfsrvd_access(struct nfsrv_descript *, int, diff --git a/sys/fs/nfsserver/nfs_nfsdsocket.c b/sys/fs/nfsserver/nfs_nfsdsocket.c index 81c224860cc0..09ed4c407c13 100644 --- a/sys/fs/nfsserver/nfs_nfsdsocket.c +++ b/sys/fs/nfsserver/nfs_nfsdsocket.c @@ -1031,7 +1031,8 @@ nfsrvd_compound(struct nfsrv_descript *nd, int isdgram, u_char *tag, cur_fsid = vp->v_mount->mnt_stat.f_fsid; NFSVOPUNLOCK(vp); vpnes = nes; - } + } else if (nd->nd_repstat == ESTALE) + nfsrv_freestrandedstate(&fh); break; case NFSV4OP_PUTPUBFH: if (nfs_pubfhset) {