]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
btrfs: zoned: requeue to unused block group list if zone finish failed
authorNaohiro Aota <naohiro.aota@wdc.com>
Tue, 19 Aug 2025 01:58:49 +0000 (21:58 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 28 Aug 2025 14:31:04 +0000 (16:31 +0200)
[ Upstream commit 62be7afcc13b2727bdc6a4c91aefed6b452e6ecc ]

btrfs_zone_finish() can fail for several reason. If it is -EAGAIN, we need
to try it again later. So, put the block group to the retry list properly.

Failing to do so will keep the removable block group intact until remount
and can causes unnecessary ENOSPC.

Fixes: 74e91b12b115 ("btrfs: zoned: zone finish unused block group")
CC: stable@vger.kernel.org # 6.1+
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Naohiro Aota <naohiro.aota@wdc.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/btrfs/block-group.c

index 1a0cb398f6794b95db0862a84e6d9f35fa2ad5ad..83a196521670b93c09e6ab55cdba0d6652b0aba4 100644 (file)
@@ -1646,8 +1646,10 @@ void btrfs_delete_unused_bgs(struct btrfs_fs_info *fs_info)
                ret = btrfs_zone_finish(block_group);
                if (ret < 0) {
                        btrfs_dec_block_group_ro(block_group);
-                       if (ret == -EAGAIN)
+                       if (ret == -EAGAIN) {
+                               btrfs_link_bg_list(block_group, &retry_list);
                                ret = 0;
+                       }
                        goto next;
                }