c8h4/btrfs-progs
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

btrfs-progs: complete the implementation RAID1C34 definitions

Browse source 
- complete the function btrfs_err_str adding some missing cases
- sync the enum btrfs_err_code (in libbtrfsutil/btrfs.h) with the
  rest of the codes (user space and kernel space).
- add missing fields to btrfs_raid_array[] for raid1c[34]

Signed-off-by: Goffredo Baroncelli <kreijack@inwind.it>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Goffredo Baroncelli 2020-03-31 21:10:42 +02:00 committed by David Sterba
parent 6384f9df92
commit 9fd37f951b
3 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ioctl.h
View file

@ -798,6 +798,10 @@ static inline char *btrfs_err_str(enum btrfs_err_code err_code)
switch (err_code) { switch (err_code) {
case BTRFS_ERROR_DEV_RAID1_MIN_NOT_MET: case BTRFS_ERROR_DEV_RAID1_MIN_NOT_MET:
return "unable to go below two devices on raid1"; return "unable to go below two devices on raid1";
case BTRFS_ERROR_DEV_RAID1C3_MIN_NOT_MET:
return "unable to go below three devices on raid1c3";
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: case BTRFS_ERROR_DEV_RAID10_MIN_NOT_MET:
return "unable to go below four devices on raid10"; return "unable to go below four devices on raid10";
case BTRFS_ERROR_DEV_RAID5_MIN_NOT_MET: case BTRFS_ERROR_DEV_RAID5_MIN_NOT_MET:

4
libbtrfsutil/btrfs.h
View file

@ -830,7 +830,9 @@ enum btrfs_err_code {
BTRFS_ERROR_DEV_TGT_REPLACE, BTRFS_ERROR_DEV_TGT_REPLACE,
BTRFS_ERROR_DEV_MISSING_NOT_FOUND, BTRFS_ERROR_DEV_MISSING_NOT_FOUND,
BTRFS_ERROR_DEV_ONLY_WRITABLE, BTRFS_ERROR_DEV_ONLY_WRITABLE,
BTRFS_ERROR_DEV_EXCL_RUN_IN_PROGRESS BTRFS_ERROR_DEV_EXCL_RUN_IN_PROGRESS,
BTRFS_ERROR_DEV_RAID1C3_MIN_NOT_MET,
BTRFS_ERROR_DEV_RAID1C4_MIN_NOT_MET,
}; };
#define BTRFS_IOC_SNAP_CREATE _IOW(BTRFS_IOCTL_MAGIC, 1, \ #define BTRFS_IOC_SNAP_CREATE _IOW(BTRFS_IOCTL_MAGIC, 1, \

6
volumes.c
View file

@ -65,6 +65,9 @@ const struct btrfs_raid_attr btrfs_raid_array[BTRFS_NR_RAID_TYPES] = {
.tolerated_failures = 2, .tolerated_failures = 2,
.devs_increment = 3, .devs_increment = 3,
.ncopies = 3, .ncopies = 3,
.raid_name = "raid1c3",
.bg_flag = BTRFS_BLOCK_GROUP_RAID1C3,
.mindev_error = BTRFS_ERROR_DEV_RAID1C3_MIN_NOT_MET,
}, },
[BTRFS_RAID_RAID1C4] = { [BTRFS_RAID_RAID1C4] = {
.sub_stripes = 1, .sub_stripes = 1,
@ -74,6 +77,9 @@ const struct btrfs_raid_attr btrfs_raid_array[BTRFS_NR_RAID_TYPES] = {
.tolerated_failures = 3, .tolerated_failures = 3,
.devs_increment = 4, .devs_increment = 4,
.ncopies = 4, .ncopies = 4,
.raid_name = "raid1c4",
.bg_flag = BTRFS_BLOCK_GROUP_RAID1C4,
.mindev_error = BTRFS_ERROR_DEV_RAID1C4_MIN_NOT_MET,
}, },
[BTRFS_RAID_DUP] = { [BTRFS_RAID_DUP] = {
.sub_stripes = 1, .sub_stripes = 1,