]> git.hungrycats.org Git - linux/commitdiff
btrfs: zoned: requeue block group if zone reset bails out
authorJohannes Thumshirn <johannes.thumshirn@wdc.com>
Thu, 10 Sep 2026 12:19:39 +0000 (14:19 +0200)
committerDavid Sterba <dsterba@suse.com>
Fri, 30 Oct 2026 20:36:17 +0000 (21:36 +0100)
btrfs_reset_unused_block_groups() drops the block-group from
fs_info->unused_bgs before performing the work that can actually fail,
the actual submission of a REQ_OP_ZONE_RESET.

Every failed operation after this leaves the block-group dangling,
physically reset, but the in-memory structures aren't and it is not
requeued to be reset on fs_info->unused_bgs.

Instead of bailing out, re-add this block-group to fs_info->unused_bgs
list.

Fixes: 453a73c3069a ("btrfs: zoned: reclaim unused zone by zone resetting")
Reviewed-by: Daniel Vacek <neelx@suse.com>
Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/zoned.c

index a6df46c077d0e37364d61400dbacbb1d69967460..be00c3c76df9284f55e0562fc868995f84fa63e7 100644 (file)
@@ -3127,6 +3127,8 @@ int btrfs_reset_unused_block_groups(struct btrfs_space_info *space_info, u64 num
 {
        struct btrfs_fs_info *fs_info = space_info->fs_info;
        const sector_t zone_size_sectors = fs_info->zone_size >> SECTOR_SHIFT;
+       LIST_HEAD(retry_list);
+       int ret = 0;
 
        if (!btrfs_is_zoned(fs_info))
                return 0;
@@ -3168,11 +3170,10 @@ int btrfs_reset_unused_block_groups(struct btrfs_space_info *space_info, u64 num
                }
                if (!found) {
                        spin_unlock(&fs_info->unused_bgs_lock);
-                       return 0;
+                       goto out;
                }
 
                list_del_init(&bg->bg_list);
-               btrfs_put_block_group(bg);
                spin_unlock(&fs_info->unused_bgs_lock);
 
                /*
@@ -3186,7 +3187,6 @@ int btrfs_reset_unused_block_groups(struct btrfs_space_info *space_info, u64 num
                for (int i = 0; i < map->num_stripes; i++) {
                        struct btrfs_io_stripe *stripe = &map->stripes[i];
                        unsigned int nofs_flags;
-                       int ret;
 
                        nofs_flags = memalloc_nofs_save();
                        ret = blkdev_zone_mgmt(stripe->dev->bdev, REQ_OP_ZONE_RESET,
@@ -3196,7 +3196,7 @@ int btrfs_reset_unused_block_groups(struct btrfs_space_info *space_info, u64 num
 
                        if (ret) {
                                up_read(&fs_info->dev_replace.rwsem);
-                               return ret;
+                               goto requeue;
                        }
                }
                up_read(&fs_info->dev_replace.rwsem);
@@ -3207,7 +3207,7 @@ int btrfs_reset_unused_block_groups(struct btrfs_space_info *space_info, u64 num
                if (bg->ro) {
                        spin_unlock(&bg->lock);
                        spin_unlock(&space_info->lock);
-                       continue;
+                       goto requeue;
                }
 
                reclaimed = bg->alloc_offset;
@@ -3236,12 +3236,28 @@ int btrfs_reset_unused_block_groups(struct btrfs_space_info *space_info, u64 num
                btrfs_return_free_space(space_info, reclaimed);
                spin_unlock(&space_info->lock);
 
+               btrfs_put_block_group(bg);
+
                if (num_bytes <= reclaimed)
                        break;
                num_bytes -= reclaimed;
+               continue;
+
+requeue:
+               list_add_tail(&bg->bg_list, &retry_list);
+
+               if (ret)
+                       goto out;
        }
 
-       return 0;
+out:
+       if (!list_empty(&retry_list)) {
+               spin_lock(&fs_info->unused_bgs_lock);
+               list_splice_tail(&retry_list, &fs_info->unused_bgs);
+               spin_unlock(&fs_info->unused_bgs_lock);
+       }
+
+       return ret;
 }
 
 void btrfs_show_zoned_stats(struct btrfs_fs_info *fs_info, struct seq_file *seq)