diff --git a/Documentation/mkfs.btrfs.asciidoc b/Documentation/mkfs.btrfs.asciidoc index b167fa40..1082b871 100644 --- a/Documentation/mkfs.btrfs.asciidoc +++ b/Documentation/mkfs.btrfs.asciidoc @@ -317,11 +317,11 @@ There are the following block group types available: ^.^h| Copies ^.^h| Parity ^. 1 && profile & BTRFS_BLOCK_GROUP_DUP) { diff --git a/ioctl.h b/ioctl.h index 9e1e3403..5ce47c83 100644 --- a/ioctl.h +++ b/ioctl.h @@ -803,7 +803,7 @@ static inline char *btrfs_err_str(enum btrfs_err_code err_code) case BTRFS_ERROR_DEV_RAID1C4_MIN_NOT_MET: return "unable to go below four devices on raid1c4"; case BTRFS_ERROR_DEV_RAID10_MIN_NOT_MET: - return "unable to go below four devices on raid10"; + return "unable to go below four/two devices on raid10"; case BTRFS_ERROR_DEV_RAID5_MIN_NOT_MET: return "unable to go below two devices on raid5"; case BTRFS_ERROR_DEV_RAID6_MIN_NOT_MET: diff --git a/kernel-shared/volumes.c b/kernel-shared/volumes.c index 26d197b5..431fb744 100644 --- a/kernel-shared/volumes.c +++ b/kernel-shared/volumes.c @@ -36,7 +36,7 @@ const struct btrfs_raid_attr btrfs_raid_array[BTRFS_NR_RAID_TYPES] = { .sub_stripes = 2, .dev_stripes = 1, .devs_max = 0, /* 0 == as many as possible */ - .devs_min = 4, + .devs_min = 2, .tolerated_failures = 1, .devs_increment = 2, .ncopies = 2, @@ -101,7 +101,7 @@ const struct btrfs_raid_attr btrfs_raid_array[BTRFS_NR_RAID_TYPES] = { .sub_stripes = 1, .dev_stripes = 1, .devs_max = 0, - .devs_min = 2, + .devs_min = 1, .tolerated_failures = 0, .devs_increment = 1, .ncopies = 1,