Date: Wed, 12 May 2021 02:49:26 GMT 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: 83e7630f3246 - stable/12 - nfscl: Fix mis-merge in cherry-pick commit 44d99af3c545 Message-ID: <202105120249.14C2nQE4086203@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/12 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=83e7630f324649ed95a07d0be440553e672ba725 commit 83e7630f324649ed95a07d0be440553e672ba725 Author: Rick Macklem <rmacklem@FreeBSD.org> AuthorDate: 2021-05-12 02:46:46 +0000 Commit: Rick Macklem <rmacklem@FreeBSD.org> CommitDate: 2021-05-12 02:46:46 +0000 nfscl: Fix mis-merge in cherry-pick commit 44d99af3c545 This is a direct commit. --- sys/fs/nfsclient/nfs_clnode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/fs/nfsclient/nfs_clnode.c b/sys/fs/nfsclient/nfs_clnode.c index 278d4f4900fe..096770e5da59 100644 --- a/sys/fs/nfsclient/nfs_clnode.c +++ b/sys/fs/nfsclient/nfs_clnode.c @@ -323,7 +323,7 @@ ncl_reclaim(struct vop_reclaim_args *ap) MNT_ILOCK(mp); if ((mp->mnt_kern_flag & MNTK_UNMOUNTF) == 0) { MNT_IUNLOCK(mp); - nfscl_delegreturnvp(vp, td); + nfscl_delegreturnvp(vp, ap->a_td); } else MNT_IUNLOCK(mp); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105120249.14C2nQE4086203>