From nobody Sat Jul 25 01:21:33 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 4h6RsB29Qwz6lbdH for ; Sat, 25 Jul 2026 01:21:34 +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 4h6RsB0fZmz3KPd for ; Sat, 25 Jul 2026 01:21:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784942494; 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=vjU408BrfMRWbojrhTZjHDPsNAdv63kPzwzr8pE03Xg=; b=JzgBD6ayCRZLKQK6Sq7yFVgYBerSzb8F8ajbC/Icxi4SFSFWThj5qBY5IpqwiPEpD8oY1U 81B6lRZ+7pxBjXCY9t70sbRKb8jqXYN5BxW0pCtfmjkYEHIiruExSg6xmQloZ/Q1EzjKJH WOgab60gArsmBSWa81dbpg7RVhaSfNt56iHnRNZcFrsBX8P+CijOPtuWrA/1eQihLBnxCT lvT4sGMNpBLZH0WFrpMOWpYTZHuwcq8uL9sro36zFhITTOwdm17MSwzsGsbiXlb7+VfzjL SK5jcoXUl4nszx+KduEjK9LFQqCcNxCdgrE1VHfufoIq7qoOReCNif1+mfOGhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784942494; a=rsa-sha256; cv=none; b=WK2+u3z5pHnRowiWda33mnVo745H2B15XzkpXVtT3K2dWRtloxNUHBv4uaQyFCL7kedeF4 jnwbSDokSCJENpW1h9mP90DeybrwF+q/RZDyGCb/44zcqCBMbEKz/lLfFMxt7+fEY8FT8q zj9GrGM9eV0pq0VS4nsIUPtA6Dlfdw/RAIeP/1zcNKCqIOWbO3wVZWBnpqYG+4XcFuINQw CgCuwZNEEjTV+GgWRbReEXN8ob+QsW0boAcy7xSJSQ2Tyuh3KFHRbcoCP8b8FNHlboSYc3 8PSi71AoUSLn7/FnpCQHGN2uyCgiMmeHrXP8qWYM2GMz5k8I/Hfv6AnX0nTA7w== 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=1784942494; 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=vjU408BrfMRWbojrhTZjHDPsNAdv63kPzwzr8pE03Xg=; b=yb8AOlrjRHh78QtshXDHyYi6hk47Ji/Eb1smjgR+bIeGzbtGvpYO/vXZFYTz+gkHmIhsz4 1pt6PaVckvzTlFTXO/Czogl3oPnGfxzcAqlWAWR8ohvPBHrmwK7TUCsQH4CC0/WMxUoDi9 /HgE49DV85Yc3eNxwaWlHNibcKVBIobPCVPvvcyJv0U1So0jbQkhOGO6P4/ulYgKNeS7Jz yJyvgT0jNBezpCWVzHH6NZpEj/607b9qvbgoaQFgxSxBQ/tvChIGwYYY7JpcV5B4s/TNC2 EaoiX9FzXqF9Ts1YWVOjiunZulmqvxwcEAeipDQEAdufc1PHoTNLzZmf05KSDw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h6Rs96s7Xz1TL for ; Sat, 25 Jul 2026 01:21:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33e41 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 25 Jul 2026 01:21:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 508af47d2f9f - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 508af47d2f9f0379b4d82da0b829ac089221982f Auto-Submitted: auto-generated Date: Sat, 25 Jul 2026 01:21:33 +0000 Message-Id: <6a640f9d.33e41.97fab8c@gitrepo.freebsd.org> The branch stable/15 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=508af47d2f9f0379b4d82da0b829ac089221982f commit 508af47d2f9f0379b4d82da0b829ac089221982f Author: Rick Macklem AuthorDate: 2026-07-11 19:30:51 +0000 Commit: Rick Macklem CommitDate: 2026-07-25 01:20:03 +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 8d8de381cbaf..3572cd386707 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 e3c42087b701..932c8d31ba59 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) {