Revert "[FreeBSD] zfs_znode_alloc: lock the vnode earlier"

This reverts commit 28bf26a.

module/os/freebsd/zfs/zfs_znode.c

@@ -449,13 +449,6 @@ zfs_znode_alloc(zfsvfs_t *zfsvfs, dmu_buf_t *db, int blksz,
 	zp->z_vnode = vp;
 	vp->v_data = zp;
 
-	/*
-	 * Acquire the vnode lock before any possible interaction with the
-	 * outside world.  Specifically, there is an error path that calls
-	 * zfs_vnode_forget() and the vnode should be exclusively locked.
-	 */
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
-
 	ASSERT(!POINTER_IS_VALID(zp->z_zfsvfs));
 
 	zp->z_sa_hdl = NULL;
@@ -472,6 +465,8 @@ zfs_znode_alloc(zfsvfs_t *zfsvfs, dmu_buf_t *db, int blksz,
 	atomic_store_ptr(&zp->z_cached_symlink, NULL);
 #endif
 
+	vp = ZTOV(zp);
+
 	zfs_znode_sa_init(zfsvfs, zp, db, obj_type, hdl);
 
 	SA_ADD_BULK_ATTR(bulk, count, SA_ZPL_MODE(zfsvfs), NULL, &mode, 8);
@@ -540,6 +535,10 @@ zfs_znode_alloc(zfsvfs_t *zfsvfs, dmu_buf_t *db, int blksz,
 	zp->z_zfsvfs = zfsvfs;
 	mutex_exit(&zfsvfs->z_znodes_lock);
 
+	/*
+	 * Acquire vnode lock before making it available to the world.
+	 */
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 #if __FreeBSD_version >= 1400077
 	vn_set_state(vp, VSTATE_CONSTRUCTED);
 #endif