Date: Sat, 25 Jul 2026 01:31:50 +0000 From: Rick Macklem <rmacklem@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 8200466be682 - stable/14 - nfsd: Commit missing patches for c52bcd09c2a6 Message-ID: <6a641206.34517.7adc209f@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch stable/14 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=8200466be6829ebbafa3ba64f623352e58fb28d3 commit 8200466be6829ebbafa3ba64f623352e58fb28d3 Author: Rick Macklem <rmacklem@FreeBSD.org> AuthorDate: 2026-07-11 19:30:51 +0000 Commit: Rick Macklem <rmacklem@FreeBSD.org> 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) {home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a641206.34517.7adc209f>