summaryrefslogtreecommitdiff
path: root/fs/btrfs/volumes.c
diff options
context:
space:
mode:
authorDavid Sterba <dsterba@suse.com>2016-02-15 16:28:14 +0100
committerDavid Sterba <dsterba@suse.com>2016-04-28 10:59:13 +0200
commit418775a22b4c67bd15915e043c3a8f29816799bd (patch)
tree74f4ef9fc0ef76b2625a1fbdbc48cf2820a7fb14 /fs/btrfs/volumes.c
parent621292bae6ae3b25cd3124b63603d01df4cccfb6 (diff)
btrfs: use existing device constraints table btrfs_raid_array
We should avoid duplicating the device constraints, let's use the btrfs_raid_array in btrfs_check_raid_min_devices. Reviewed-by: Anand Jain <anand.jain@oracle.com> Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/volumes.c')
-rw-r--r--fs/btrfs/volumes.c23
1 files changed, 9 insertions, 14 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 6b38b72d678b..055fbebea199 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -1731,6 +1731,7 @@ static int btrfs_check_raid_min_devices(struct btrfs_fs_info *fs_info,
{
u64 all_avail;
unsigned seq;
+ int i;
do {
seq = read_seqbegin(&fs_info->profiles_lock);
@@ -1740,22 +1741,16 @@ static int btrfs_check_raid_min_devices(struct btrfs_fs_info *fs_info,
fs_info->avail_metadata_alloc_bits;
} while (read_seqretry(&fs_info->profiles_lock, seq));
- if ((all_avail & BTRFS_BLOCK_GROUP_RAID10) && num_devices < 4) {
- return BTRFS_ERROR_DEV_RAID10_MIN_NOT_MET;
- }
-
- if ((all_avail & BTRFS_BLOCK_GROUP_RAID1) && num_devices < 2) {
- return BTRFS_ERROR_DEV_RAID1_MIN_NOT_MET;
- }
+ for (i = 0; i < BTRFS_NR_RAID_TYPES; i++) {
+ if (!(all_avail & btrfs_raid_group[i]))
+ continue;
- if ((all_avail & BTRFS_BLOCK_GROUP_RAID5) &&
- fs_info->fs_devices->rw_devices < 2) {
- return BTRFS_ERROR_DEV_RAID5_MIN_NOT_MET;
- }
+ if (num_devices < btrfs_raid_array[i].devs_min) {
+ int ret = btrfs_raid_mindev_error[i];
- if ((all_avail & BTRFS_BLOCK_GROUP_RAID6) &&
- fs_info->fs_devices->rw_devices < 3) {
- return BTRFS_ERROR_DEV_RAID6_MIN_NOT_MET;
+ if (ret)
+ return ret;
+ }
}
return 0;