wip

vpsfreecz · Oct 31, 2024 · 69519cc · 69519cc
1 parent 933c765
commit 69519cc
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/module/os/linux/zfs/zfs_znode_os.c b/module/os/linux/zfs/zfs_znode_os.c
@@ -571,7 +571,6 @@ zfs_znode_alloc(zfsvfs_t *zfsvfs, dmu_buf_t *db, int blksz,
 	zp->z_mode = ip->i_mode = mode;
 	ip->i_generation = (uint32_t)tmp_gen;
 	ip->i_blkbits = SPA_MINBLOCKSHIFT;
-	atomic_set(&ip->i_count, 1);
 	set_nlink(ip, (uint32_t)links);
 
 	zfs_uid_write(ip, zfs_ugid_map_ns_to_host(zfsvfs->z_uid_map, z_uid));
@@ -898,7 +897,6 @@ zfs_mknode(znode_t *dzp, vattr_t *vap, dmu_tx_t *tx, cred_t *cr,
 		do {
 			*zpp = zfs_znode_alloc(zfsvfs, db, 0, obj_type, sa_hdl);
 		} while (*zpp == NULL);
-
 		VERIFY(*zpp != NULL);
 		VERIFY(dzp != NULL);
 	} else {
@@ -907,10 +905,10 @@ zfs_mknode(znode_t *dzp, vattr_t *vap, dmu_tx_t *tx, cred_t *cr,
 		 * passed in is the znode for the root.
 		 */
 		*zpp = dzp;
-		zhold(*zpp);
 
 		(*zpp)->z_sa_hdl = sa_hdl;
 	}
+	zhold(*zpp);
 
 	(*zpp)->z_pflags = pflags;
 	(*zpp)->z_mode = ZTOI(*zpp)->i_mode = mode;
@@ -1141,6 +1139,7 @@ zfs_zget(zfsvfs_t *zfsvfs, uint64_t obj_num, znode_t **zpp)
 		err = SET_ERROR(ENOENT);
 	} else {
 		*zpp = zp;
+		zhold(*zpp);
 		VERIFY0(insert_inode_locked(ZTOI(zp)));
 		unlock_new_inode(ZTOI(zp));
 	}