X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=blobdiff_plain;f=fs%2Fbtrfs%2Fvolumes.c;h=71add22e041ade2628bd7c650ccc3fa5706ec347;hp=301e60b11dd08857ded94204daca9cc23d068e7f;hb=6079e12cdb8f9afb02b9f4f3e4d13c076e1e99e9;hpb=081db89b13cb26f9ef1f5b1752f7fcb775191cbe diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 301e60b11dd0..71add22e041a 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -4110,11 +4110,16 @@ int btrfs_balance(struct btrfs_fs_info *fs_info, goto out; } - /* allow to reduce meta or sys integrity only if force set */ - allowed = BTRFS_BLOCK_GROUP_DUP | BTRFS_BLOCK_GROUP_RAID1 | - BTRFS_BLOCK_GROUP_RAID10 | - BTRFS_BLOCK_GROUP_RAID5 | - BTRFS_BLOCK_GROUP_RAID6; + /* + * Allow to reduce metadata or system integrity only if force set for + * profiles with redundancy (copies, parity) + */ + allowed = 0; + for (i = 0; i < ARRAY_SIZE(btrfs_raid_array); i++) { + if (btrfs_raid_array[i].ncopies >= 2 || + btrfs_raid_array[i].tolerated_failures >= 1) + allowed |= btrfs_raid_array[i].bg_flag; + } do { seq = read_seqbegin(&fs_info->profiles_lock);