p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

btrfs: drop incompat bit for raid1c34 after last block group is gone 

When there are no raid1c3 or raid1c4 block groups left after balance
(either convert or with other filters applied), remove the incompat bit.
This is already done for RAID56, do the same for RAID1C34.

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2019-10-31 15:52:01 +01:00
parent cfbb825c76
commit 9c907446dc
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
fs/btrfs/block-group.c
View File

@ -828,27 +828,36 @@ static void clear_avail_alloc_bits(struct btrfs_fs_info *fs_info, u64 flags)
* *
* - RAID56 - in case there's neither RAID5 nor RAID6 profile block group * - RAID56 - in case there's neither RAID5 nor RAID6 profile block group
* in the whole filesystem * in the whole filesystem
*
* - RAID1C34 - same as above for RAID1C3 and RAID1C4 block groups
*/ */
static void clear_incompat_bg_bits(struct btrfs_fs_info *fs_info, u64 flags) static void clear_incompat_bg_bits(struct btrfs_fs_info *fs_info, u64 flags)
{ {
if (flags & BTRFS_BLOCK_GROUP_RAID56_MASK) { bool found_raid56 = false;
bool found_raid1c34 = false;
if ((flags & BTRFS_BLOCK_GROUP_RAID56_MASK) ||
(flags & BTRFS_BLOCK_GROUP_RAID1C3) ||
(flags & BTRFS_BLOCK_GROUP_RAID1C4)) {
struct list_head *head = &fs_info->space_info; struct list_head *head = &fs_info->space_info;
struct btrfs_space_info *sinfo; struct btrfs_space_info *sinfo;
list_for_each_entry_rcu(sinfo, head, list) { list_for_each_entry_rcu(sinfo, head, list) {
bool found = false;
down_read(&sinfo->groups_sem); down_read(&sinfo->groups_sem);
if (!list_empty(&sinfo->block_groups[BTRFS_RAID_RAID5])) if (!list_empty(&sinfo->block_groups[BTRFS_RAID_RAID5]))
found = true; found_raid56 = true;
if (!list_empty(&sinfo->block_groups[BTRFS_RAID_RAID6])) if (!list_empty(&sinfo->block_groups[BTRFS_RAID_RAID6]))
found = true; found_raid56 = true;
if (!list_empty(&sinfo->block_groups[BTRFS_RAID_RAID1C3]))
found_raid1c34 = true;
if (!list_empty(&sinfo->block_groups[BTRFS_RAID_RAID1C4]))
found_raid1c34 = true;
up_read(&sinfo->groups_sem); up_read(&sinfo->groups_sem);
if (found)
return;
} }
btrfs_clear_fs_incompat(fs_info, RAID56); if (found_raid56)
btrfs_clear_fs_incompat(fs_info, RAID56);
if (found_raid1c34)
btrfs_clear_fs_incompat(fs_info, RAID1C34);
} }
} }