btrfs: refactor btrfs_check_zoned_mode
PATCH 1/1 btrfs: refactor btrfs_check_zoned_mode
btrfs_check_zoned_mode is really hard to follow, mostly due to the fact that a lot of the checks use duplicate conditions after support for zone emulation for conventional devices on file systems with the ZONED flag was added. Fix this by splitting out the check for host managed devices for !ZONED file systems into a separate helper and then simplifying the rest of the code.
--- fs/btrfs/zoned.c | 111 +++++++++++++++++------------------------------ 1 file changed, 41 insertions(+), 70 deletions(-)
fs/btrfs/zoned.c +41 -70
@@ -652,80 +652,54 @@ int btrfs_get_dev_zone(struct btrfs_device *device, u64 pos,return 0 ; } +static int btrfs_check_for_zoned_device (struct btrfs_fs_info *fs_info) +{ +struct btrfs_device *device; + +list_for_each_entry (device, &fs_info->fs_devices->devices, dev_list) { +if (device->bdev && +bdev_zoned_model (device->bdev) ==BLK_ZONED_HM ) { +btrfs_err (fs_info, +"zoned: mode not enabled but zoned device found" ); +return -EINVAL ; + } + } + +return 0 ; +} +int btrfs_check_zoned_mode (struct btrfs_fs_info *fs_info) { -struct btrfs_fs_devices *fs_devices = fs_info->fs_devices;struct btrfs_device *device; -u64 zoned_devices =0 ; -u64 nr_devices =0 ;u64 zone_size =0 ;u64 max_zone_append_size =0 ; -const bool incompat_zoned =btrfs_fs_incompat (fs_info,ZONED ); -int ret =0 ; +int ret; -/* Count zoned devices */ -list_for_each_entry (device, &fs_devices->devices, dev_list) { -enum blk_zoned_model model; +/* +* Host-Managed devices can't be used without the ZONED flag. With the +* ZONED all devices can be used, using zone emulation if required. +*/ +if (!btrfs_fs_incompat (fs_info,ZONED )) +return btrfs_check_for_zoned_device (fs_info); + +list_for_each_entry (device, &fs_info->fs_devices->devices, dev_list) { +struct btrfs_zoned_device_info *zone_info = device->zone_info;if (!device->bdev)continue ; - model =bdev_zoned_model (device->bdev); -/* -* A Host-Managed zoned device must be used as a zoned device. -* A Host-Aware zoned device and a non-zoned devices can be -* treated as a zoned device, if ZONED flag is enabled in the -* superblock. -*/ -if (model ==BLK_ZONED_HM || - (model ==BLK_ZONED_HA && incompat_zoned) || - (model ==BLK_ZONED_NONE && incompat_zoned)) { -struct btrfs_zoned_device_info *zone_info; - - zone_info = device->zone_info; - zoned_devices++; -if (!zone_size) { - zone_size = zone_info->zone_size; - }else if (zone_info->zone_size != zone_size) { -btrfs_err (fs_info, -"zoned: unequal block device zone sizes: have %llu found %llu" , - device->zone_info->zone_size, - zone_size); - ret = -EINVAL ; - goto out; - } -if (!max_zone_append_size || - (zone_info->max_zone_append_size && - zone_info->max_zone_append_size < max_zone_append_size)) - max_zone_append_size = - zone_info->max_zone_append_size; +if (!zone_size) { + zone_size = zone_info->zone_size; + }else if (zone_info->zone_size != zone_size) { +btrfs_err (fs_info, +"zoned: unequal block device zone sizes: have %llu found %llu" , + zone_info->zone_size, zone_size); +return -EINVAL ; } - nr_devices++; - } - -if (!zoned_devices && !incompat_zoned) - goto out; - -if (!zoned_devices && incompat_zoned) { -/* No zoned block device found on ZONED filesystem */ -btrfs_err (fs_info, -"zoned: no zoned devices found on a zoned filesystem" ); - ret = -EINVAL ; - goto out; - } - -if (zoned_devices && !incompat_zoned) { -btrfs_err (fs_info, -"zoned: mode not enabled but zoned device found" ); - ret = -EINVAL ; - goto out; - } - -if (zoned_devices != nr_devices) { -btrfs_err (fs_info, -"zoned: cannot mix zoned and regular devices" ); - ret = -EINVAL ; - goto out; +if (!max_zone_append_size || + (zone_info->max_zone_append_size && + zone_info->max_zone_append_size < max_zone_append_size)) + max_zone_append_size = zone_info->max_zone_append_size; }/*
@@ -737,14 +711,12 @@ int btrfs_check_zoned_mode(struct btrfs_fs_info *fs_info)btrfs_err (fs_info,"zoned: zone size %llu not aligned to stripe %u" , zone_size,BTRFS_STRIPE_LEN ); - ret = -EINVAL ; - goto out; +return -EINVAL ; }if (btrfs_fs_incompat (fs_info,MIXED_GROUPS )) {btrfs_err (fs_info,"zoned: mixed block groups not supported" ); - ret = -EINVAL ; - goto out; +return -EINVAL ; } fs_info->zone_size = zone_size;
@@ -760,11 +732,10 @@ int btrfs_check_zoned_mode(struct btrfs_fs_info *fs_info)*/ ret =btrfs_check_mountopts_zoned (fs_info);if (ret) - goto out; +return ret;btrfs_info (fs_info,"zoned mode enabled with zone size %llu" , zone_size); -out: -return ret; +return 0 ; }int btrfs_check_mountopts_zoned (struct btrfs_fs_info *info)
Signature · 1 line
2.30.2
Quoted 11 lines · Christoph Hellwig
btrfs_check_zoned_modeis really hard to follow, mostly due to the fact that a lot of the checks use duplicate conditions after support for zone emulation for conventional devices on file systems with the ZONED flag was added. Fix this by splitting out the check for host managed devices for !ZONED file systems into a separate helper and then simplifying the rest of the code.Signed-off-by Christoph Hellwig <[email protected]>--- fs/btrfs/zoned.c | 111 +++++++++++++++++------------------------------ 1 file changed, 41 insertions(+), 70 deletions(-)
Looks good to me. Yeah, factoring out the non-ZONED flag case made it far better. A small nit below.
fs/btrfs/zoned.c int btrfs_get_dev_zone(struct btrfs_device *device, u64 pos, · line 655
Quoted 9 lines
fs/btrfs/zoned.c +1
-0@@ -652,80 +652,54 @@ int btrfs_get_dev_zone(struct btrfs_device *device, u64 pos,return 0 ; } +static int btrfs_check_for_zoned_device (struct btrfs_fs_info *fs_info)
Maybe, we don't need the "btrfs_" prefix for a file-internal function.
Quoted 147 lines
fs/btrfs/zoned.c +40
-70+{ +struct btrfs_device *device; + +list_for_each_entry (device, &fs_info->fs_devices->devices, dev_list) { +if (device->bdev && +bdev_zoned_model (device->bdev) ==BLK_ZONED_HM ) { +btrfs_err (fs_info, +"zoned: mode not enabled but zoned device found" ); +return -EINVAL ; + } + } + +return 0 ; +} +int btrfs_check_zoned_mode (struct btrfs_fs_info *fs_info) { -struct btrfs_fs_devices *fs_devices = fs_info->fs_devices;struct btrfs_device *device; -u64 zoned_devices =0 ; -u64 nr_devices =0 ;u64 zone_size =0 ;u64 max_zone_append_size =0 ; -const bool incompat_zoned =btrfs_fs_incompat (fs_info,ZONED ); -int ret =0 ; +int ret; -/* Count zoned devices */ -list_for_each_entry (device, &fs_devices->devices, dev_list) { -enum blk_zoned_model model; +/* +* Host-Managed devices can't be used without the ZONED flag. With the +* ZONED all devices can be used, using zone emulation if required. +*/ +if (!btrfs_fs_incompat (fs_info,ZONED )) +return btrfs_check_for_zoned_device (fs_info); + +list_for_each_entry (device, &fs_info->fs_devices->devices, dev_list) { +struct btrfs_zoned_device_info *zone_info = device->zone_info;if (!device->bdev)continue ; - model =bdev_zoned_model (device->bdev); -/* -* A Host-Managed zoned device must be used as a zoned device. -* A Host-Aware zoned device and a non-zoned devices can be -* treated as a zoned device, if ZONED flag is enabled in the -* superblock. -*/ -if (model ==BLK_ZONED_HM || - (model ==BLK_ZONED_HA && incompat_zoned) || - (model ==BLK_ZONED_NONE && incompat_zoned)) { -struct btrfs_zoned_device_info *zone_info; - - zone_info = device->zone_info; - zoned_devices++; -if (!zone_size) { - zone_size = zone_info->zone_size; - }else if (zone_info->zone_size != zone_size) { -btrfs_err (fs_info, -"zoned: unequal block device zone sizes: have %llu found %llu" , - device->zone_info->zone_size, - zone_size); - ret = -EINVAL ; - goto out; - } -if (!max_zone_append_size || - (zone_info->max_zone_append_size && - zone_info->max_zone_append_size < max_zone_append_size)) - max_zone_append_size = - zone_info->max_zone_append_size; +if (!zone_size) { + zone_size = zone_info->zone_size; + }else if (zone_info->zone_size != zone_size) { +btrfs_err (fs_info, +"zoned: unequal block device zone sizes: have %llu found %llu" , + zone_info->zone_size, zone_size); +return -EINVAL ; } - nr_devices++; - } - -if (!zoned_devices && !incompat_zoned) - goto out; - -if (!zoned_devices && incompat_zoned) { -/* No zoned block device found on ZONED filesystem */ -btrfs_err (fs_info, -"zoned: no zoned devices found on a zoned filesystem" ); - ret = -EINVAL ; - goto out; - } - -if (zoned_devices && !incompat_zoned) { -btrfs_err (fs_info, -"zoned: mode not enabled but zoned device found" ); - ret = -EINVAL ; - goto out; - } - -if (zoned_devices != nr_devices) { -btrfs_err (fs_info, -"zoned: cannot mix zoned and regular devices" ); - ret = -EINVAL ; - goto out; +if (!max_zone_append_size || + (zone_info->max_zone_append_size && + zone_info->max_zone_append_size < max_zone_append_size)) + max_zone_append_size = zone_info->max_zone_append_size; }/* @@ -737,14 +711,12 @@ int btrfs_check_zoned_mode(struct btrfs_fs_info *fs_info)btrfs_err (fs_info,"zoned: zone size %llu not aligned to stripe %u" , zone_size,BTRFS_STRIPE_LEN ); - ret = -EINVAL ; - goto out; +return -EINVAL ; }if (btrfs_fs_incompat (fs_info,MIXED_GROUPS )) {btrfs_err (fs_info,"zoned: mixed block groups not supported" ); - ret = -EINVAL ; - goto out; +return -EINVAL ; } fs_info->zone_size = zone_size;@@ -760,11 +732,10 @@ int btrfs_check_zoned_mode(struct btrfs_fs_info *fs_info)*/ ret =btrfs_check_mountopts_zoned (fs_info);if (ret) - goto out; +return ret;btrfs_info (fs_info,"zoned mode enabled with zone size %llu" , zone_size); -out: -return ret; +return 0 ; }int btrfs_check_mountopts_zoned (struct btrfs_fs_info *info)Signature · 1 line
2.30.2
Quoted 10 lines · Naohiro Aota
fs/btrfs/zoned.c int btrfs_get_dev_zone(struct btrfs_device *device, u64 pos, · line 655
Quoted 7 lines · Christoph Hellwig
fs/btrfs/zoned.c +1
-0@@ -652,80 +652,54 @@ int btrfs_get_dev_zone(struct btrfs_device *device, u64 pos,return 0 ; } +static int btrfs_check_for_zoned_device (struct btrfs_fs_info *fs_info)Maybe, we don't need the "
btrfs_" prefix for a file-internal function.
Exported functions should have the prefix, for static it's nice to have so it's obvious that it's our function and not some generic helper.
Quoted 8 lines · Christoph Hellwig
btrfs_check_zoned_modeis really hard to follow, mostly due to the fact that a lot of the checks use duplicate conditions after support for zone emulation for conventional devices on file systems with the ZONED flag was added. Fix this by splitting out the check for host managed devices for !ZONED file systems into a separate helper and then simplifying the rest of the code.Signed-off-by Christoph Hellwig <[email protected]>
Added to misc-next with some fixups, thanks.
Quoted 11 lines
--- fs/btrfs/zoned.c | 111 +++++++++++++++++------------------------------ 1 file changed, 41 insertions(+), 70 deletions(-)fs/btrfs/zoned.c +0
-0@@ -652,80 +652,54 @@ int btrfs_get_dev_zone(struct btrfs_device *device, u64 pos,return 0 ; }
fs/btrfs/zoned.c int btrfs_get_dev_zone(struct btrfs_device *device, u64 pos, · line 663
Quoted 10 lines
fs/btrfs/zoned.c +9
-0+static int btrfs_check_for_zoned_device (struct btrfs_fs_info *fs_info) +{ +struct btrfs_device *device; + +list_for_each_entry (device, &fs_info->fs_devices->devices, dev_list) { +if (device->bdev && +bdev_zoned_model (device->bdev) ==BLK_ZONED_HM ) { +btrfs_err (fs_info, +"zoned: mode not enabled but zoned device found" );
I've added %pg to print the problematic device.
Quoted 6 lines
fs/btrfs/zoned.c +6
-0+return -EINVAL ; + } + } + +return 0 ; +}