git: ce3a386d627d - stable/13 - zfs: Fix the build
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 27 Oct 2022 12:43:05 UTC
The branch stable/13 has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=ce3a386d627d808997959971132c149ea6ce9d43
commit ce3a386d627d808997959971132c149ea6ce9d43
Author: Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2022-10-27 12:42:08 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2022-10-27 12:42:54 +0000
zfs: Fix the build
ZFS_ENTER changed between main and stable/13.
This is a direct commit to stable/13.
Fixes: 562c9ac58c76 ("zfs: Fix a pair of bugs in zfs_fhtovp()")
Reported by: Jenkins
---
sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c
index 928cd83dfea0..05d41d4e3b2a 100644
--- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c
+++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c
@@ -1846,7 +1846,7 @@ zfs_fhtovp(vfs_t *vfsp, fid_t *fidp, int flags, vnode_t **vpp)
}
if (fidp->fid_len == LONG_FID_LEN && setgen != 0) {
- zfs_exit(zfsvfs, FTAG);
+ ZFS_EXIT(zfsvfs);
dprintf("snapdir fid: fid_gen (%llu) and setgen (%llu)\n",
(u_longlong_t)fid_gen, (u_longlong_t)setgen);
return (SET_ERROR(EINVAL));