From nobody Sat Jul 11 19:33:42 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 4gyJlp42xCz6lWvh for ; Sat, 11 Jul 2026 19:33:42 +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 4gyJlp1ZKKz3cvl for ; Sat, 11 Jul 2026 19:33:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783798422; 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=SwvMU/wA9Uneng3PujON9etOwNpLUSYp8bLyZzCSgcE=; b=MNt6BbyoxjMue4LmSfW7kDSo2eclKyOh7x/ziQDmNVBNTLajWoOIfzRL/HQABFA7Q8YQ2M OPUolft5oIDKBp3BAm7ViGjiI/uF60992LZOM5pdeHeMbjI5Eg5yhacmCPpaHF4n8c832U 1OLvaRGvF41g9b4ukhN+qwMcSdacYlwflsO+0dWyiDrTE7L++8DjlbmtQXrKWNfb5ZX8JH 0w1OoyUxwd0lZnbnrFHQu58UCwRZuj4tW3UMKFwg6hZS669WUDN8La/oPEWq34QarHNoeo ous+1reKRkbM7TNhves7uAQ/vwGoxMKGRi68jwtUF/H/5LIU6YtJgATkba0CwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783798422; a=rsa-sha256; cv=none; b=DC+GDOCBODxjmPs7B7zfQrPoUrUPsOGSlUY3NzlsrePq9PBHxTgxJ4gXP37vsAcDEc4GYT jM6E/DY5x7/InevkU4XW4m9vnzJzG5TbUjmM1GaygKMAY+blVDCJkUglPZ61Pn7wnDSndz N0h4lm9+upB/KuxyYyGOV7RLjQKvPOD2JHoQ+IXaavKQe7zL6FNf7l2jmlvWnQjaGysGJW urCaQt79sBpypvNggTyBn3WBQ84xKlqVVFe3HxN1rQPLe9RBf92mE/1Y7sY1h6j6NhYQn2 1V9z2KtGNk7iweL016DodqnyQUTOOwdCX3UwcVI/DmEwLlYjoydfUnp5AQvOsw== 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=1783798422; 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=SwvMU/wA9Uneng3PujON9etOwNpLUSYp8bLyZzCSgcE=; b=xR1AIcOCbN7fptRpqcxoVFWkzJcjBS91fWNGmCQDfh70JwEsR3XXoU+aIvRskCucbhLXfR 4uK6hd1AxFxoG3avpYpPkuxFfg6+4yRwztXG1j0pxL2m8SKQm0QiTAiJ+WAOMBC6zuuZ0N wb68xjHEgwHGmLkqGufGLDbI+zPswzPw9HmPpYroGOxuOkr0Qesm9LYxz9fmHWrlLF5Bto sSv3ULuvfkqWagnXHKw4pjQDABKPoACcWM4MgpAxiMJPGNltuvliB24GsPKNrjj+0nloyu z+2+j79kZXzEigSVR+bz9DUKBaNdqfTpJ47Kfzm+UdTEVGmhV99K3m6oeDf80g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gyJlp0Qb5zvQn for ; Sat, 11 Jul 2026 19:33:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30b76 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 11 Jul 2026 19:33:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 30d4d3db431a - main - 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/main X-Git-Reftype: branch X-Git-Commit: 30d4d3db431a5df8084048c4d31e98e74d2f225a Auto-Submitted: auto-generated Date: Sat, 11 Jul 2026 19:33:42 +0000 Message-Id: <6a529a96.30b76.4feffba5@gitrepo.freebsd.org> The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=30d4d3db431a5df8084048c4d31e98e74d2f225a commit 30d4d3db431a5df8084048c4d31e98e74d2f225a Author: Rick Macklem AuthorDate: 2026-07-11 19:30:51 +0000 Commit: Rick Macklem CommitDate: 2026-07-11 19:32:46 +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. MFC after: 2 weeks Fixes: c52bcd09c2a6 ("nfsd: Garbage collect stray NFSv4 state") --- 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 525f573b5167..57cf1566a14d 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 nfsdevice **); void nfsrv_marknospc(char *, bool); void nfsrv_removedeleg(fhandle_t *, struct nfsrv_descript *, NFSPROC_T *); +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 36996425ae95..70aa20d4aa04 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) {