From 106e7659a63543b4cae47d78fafb9a49a7257bcd Mon Sep 17 00:00:00 2001 From: Joergen Lundman Date: Thu, 9 Nov 2023 12:32:33 +0900 Subject: [PATCH] Re-arrange z_blksz in zfs_znode_alloc() --- module/os/macos/zfs/zfs_znode.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/module/os/macos/zfs/zfs_znode.c b/module/os/macos/zfs/zfs_znode.c index e44d9f8b20bf..364283ed4876 100644 --- a/module/os/macos/zfs/zfs_znode.c +++ b/module/os/macos/zfs/zfs_znode.c @@ -563,7 +563,13 @@ zfs_znode_alloc(zfsvfs_t *zfsvfs, dmu_buf_t *db, int blksz, zp->z_atime_dirty = 0; zp->z_mapcnt = 0; zp->z_id = db->db_object; - zp->z_blksz = blksz; + + /* Start from ashift instead of 512 */ + if (zfsvfs->z_os->os_spa->spa_min_alloc > 0) + zp->z_blksz = zfsvfs->z_os->os_spa->spa_min_alloc; + else + zp->z_blksz = blksz; + zp->z_seq = 0x7A4653; zp->z_sync_cnt = 0; @@ -624,10 +630,6 @@ zfs_znode_alloc(zfsvfs_t *zfsvfs, dmu_buf_t *db, int blksz, zp->z_zfsvfs = zfsvfs; mutex_exit(&zfsvfs->z_znodes_lock); - /* This makes a large difference on 4096 block devices */ - if (zfsvfs->z_os->os_spa->spa_min_alloc > zp->z_blksz) - zp->z_blksz = zfsvfs->z_os->os_spa->spa_min_alloc; - return (zp); }