Commit 74c7cc79 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-6.17-rc7-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux 

Pull btrfs fix from David Sterba:
 "One more regression fix for a problem in zoned mode: mounting would
  fail if the number of open and active zones reached a common limit
  that didn't use to be checked"

* tag 'for-6.17-rc7-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
  btrfs: zoned: don't fail mount needlessly due to too many active zones
parents fd7d9275 53de7ee4

fs/btrfs/zoned.c

+6 −0
Original line number Diff line number Diff line
@@ -514,6 +514,11 @@ int btrfs_get_dev_zone_info(struct btrfs_device *device, bool populate_cache) 


	if (max_active_zones) {

		if (nactive > max_active_zones) {

			if (bdev_max_active_zones(bdev) == 0) {

				max_active_zones = 0;

				zone_info->max_active_zones = 0;

				goto validate;

			}

			btrfs_err(device->fs_info,

			"zoned: %u active zones on %s exceeds max_active_zones %u",

					 nactive, rcu_dereference(device->name),
@@ -526,6 +531,7 @@ int btrfs_get_dev_zone_info(struct btrfs_device *device, bool populate_cache) 
		set_bit(BTRFS_FS_ACTIVE_ZONE_TRACKING, &fs_info->flags);

	}



validate:

	/* Validate superblock log */

	nr_zones = BTRFS_NR_SB_LOG_ZONES;

	for (i = 0; i < BTRFS_SUPER_MIRROR_MAX; i++) {