Remove abd-cache as SLABS, set blksz to recordsize.

Signed-off-by: Jorgen Lundman <[email protected]>
openzfsonwindows · Nov 4, 2023 · 1ecc0ca · 1ecc0ca
1 parent fc741be
commit 1ecc0ca
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/module/os/windows/zfs/abd_os.c b/module/os/windows/zfs/abd_os.c
@@ -387,7 +387,7 @@ abd_init(void)
 
 	abd_chunk_cache = kmem_cache_create("abd_chunk", zfs_abd_chunk_size,
 	    ABD_PGSIZE,
-	    NULL, NULL, NULL, NULL, abd_arena, KMC_ARENA_SLAB | KMC_NOTOUCH);
+	    NULL, NULL, NULL, NULL, abd_arena, KMC_NOTOUCH);
 
 	wmsum_init(&abd_sums.abdstat_struct_size, 0);
 	wmsum_init(&abd_sums.abdstat_scatter_cnt, 0);
@@ -432,7 +432,7 @@ abd_init(void)
 		abd_subpage_cache[index] =
 		    kmem_cache_create(name, bytes, sizeof (void *),
 		    NULL, NULL, NULL, NULL, abd_subpage_arena,
-		    KMC_ARENA_SLAB | KMC_NOTOUCH);
+		    KMC_NOTOUCH);
 
 		VERIFY3P(abd_subpage_cache[index], !=, NULL);
 	}

diff --git a/module/os/windows/zfs/zfs_znode.c b/module/os/windows/zfs/zfs_znode.c
@@ -550,9 +550,6 @@ zfs_znode_alloc(zfsvfs_t *zfsvfs, dmu_buf_t *db, int blksz,
 	ASSERT(zp->z_dirlocks == NULL);
 	ASSERT(!POINTER_IS_VALID(zp->z_zfsvfs));
 
-	if (blksz == 0)
-		blksz = 0x200;
-
 	/*
 	 * Defer setting z_zfsvfs until the znode is ready to be a candidate for
 	 * the zfs_znode_move() callback.
@@ -627,6 +624,9 @@ zfs_znode_alloc(zfsvfs_t *zfsvfs, dmu_buf_t *db, int blksz,
 	zp->z_zfsvfs = zfsvfs;
 	mutex_exit(&zfsvfs->z_znodes_lock);
 
+	if (zp->z_blksz == 0)
+		zp->z_blksz = zfs_blksz(zp);
+
 	return (zp);
 }