summaryrefslogtreecommitdiff
path: root/fs/btrfs/volumes.c
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2019-12-29 02:30:37 +0300
committerLinus Walleij <linus.walleij@linaro.org>2019-12-29 02:30:37 +0300
commite5399ab2c14963457db221f5a59d12a98f998792 (patch)
treef78b90b55fc59fcbfab55fbe8dd288a49d46b97c /fs/btrfs/volumes.c
parent534ad35798aff40a93acac4c6d204ff8867701aa (diff)
parent46cf053efec6a3a5f343fead837777efe8252a46 (diff)
downloadlinux-e5399ab2c14963457db221f5a59d12a98f998792.tar.xz
Merge tag 'v5.5-rc3' into devel
Linux 5.5-rc3
Diffstat (limited to 'fs/btrfs/volumes.c')
-rw-r--r--fs/btrfs/volumes.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index d8e5560db285..a6d3f08bfff3 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -61,7 +61,7 @@ const struct btrfs_raid_attr btrfs_raid_array[BTRFS_NR_RAID_TYPES] = {
[BTRFS_RAID_RAID1C3] = {
.sub_stripes = 1,
.dev_stripes = 1,
- .devs_max = 0,
+ .devs_max = 3,
.devs_min = 3,
.tolerated_failures = 2,
.devs_increment = 3,
@@ -73,7 +73,7 @@ const struct btrfs_raid_attr btrfs_raid_array[BTRFS_NR_RAID_TYPES] = {
[BTRFS_RAID_RAID1C4] = {
.sub_stripes = 1,
.dev_stripes = 1,
- .devs_max = 0,
+ .devs_max = 4,
.devs_min = 4,
.tolerated_failures = 3,
.devs_increment = 4,