Exit the teardown section later in rename on FreeBSD

We have to hold the teardown lock while dereferencing zfsvfs->z_os and, I believe, when committing to the ZIL. Note that jumping to the "out" label, "error" is always non-zero. Signed-off-by: Mark Johnston <[email protected]>
openzfs · Oct 28, 2021 · 37185e7 · 37185e7
1 parent 9b76db0
commit 37185e7
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/module/os/freebsd/zfs/zfs_vnops_os.c b/module/os/freebsd/zfs/zfs_vnops_os.c
@@ -3431,7 +3431,6 @@ zfs_rename_(vnode_t *sdvp, vnode_t **svpp, struct componentname *scnp,
 	dmu_tx_commit(tx);
 
 unlockout:			/* all 4 vnodes are locked, ZFS_ENTER called */
-	ZFS_EXIT(zfsvfs);
 	if (want_seqc_end) {
 		vn_seqc_write_end(*svpp);
 		vn_seqc_write_end(sdvp);
@@ -3444,10 +3443,12 @@ zfs_rename_(vnode_t *sdvp, vnode_t **svpp, struct componentname *scnp,
 	VOP_UNLOCK1(*svpp);
 	VOP_UNLOCK1(sdvp);
 
-out:				/* original two vnodes are locked */
-	MPASS(!want_seqc_end);
 	if (error == 0 && zfsvfs->z_os->os_sync == ZFS_SYNC_ALWAYS)
 		zil_commit(zilog, 0);
+	ZFS_EXIT(zfsvfs);
+
+out:				/* original two vnodes are locked */
+	MPASS(!want_seqc_end);
 
 	if (*tvpp != NULL)
 		VOP_UNLOCK1(*tvpp);