diff options
| author | Anand Jain | 2018-04-25 13:01:42 +0200 |
|---|---|---|
| committer | David Sterba | 2018-05-28 18:07:27 +0200 |
| commit | ed23467b180421d37f9a6ce26c8fa8f03aef0a4a (patch) | |
| tree | e98b2cdba98f47148d52c45a54c4b171228ac266 /fs/btrfs/volumes.c | |
| parent | btrfs: print-tree: Add eb locking status output for debug build (diff) | |
| download | kernel-qcow2-linux-ed23467b180421d37f9a6ce26c8fa8f03aef0a4a.tar.gz kernel-qcow2-linux-ed23467b180421d37f9a6ce26c8fa8f03aef0a4a.tar.xz kernel-qcow2-linux-ed23467b180421d37f9a6ce26c8fa8f03aef0a4a.zip | |
btrfs: move btrfs_raid_type_names values to btrfs_raid_attr table
Add a new member struct btrfs_raid_attr::raid_name so that
btrfs_raid_array can maintain the name of the raid type, and so we can
drop btrfs_raid_type_names.
Signed-off-by: Anand Jain <anand.jain@oracle.com>
Reviewed-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/volumes.c')
| -rw-r--r-- | fs/btrfs/volumes.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 685921ba4c34..6abd0ebb3fea 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -40,6 +40,7 @@ const struct btrfs_raid_attr btrfs_raid_array[BTRFS_NR_RAID_TYPES] = { .tolerated_failures = 1, .devs_increment = 2, .ncopies = 2, + .raid_name = "raid10", }, [BTRFS_RAID_RAID1] = { .sub_stripes = 1, @@ -49,6 +50,7 @@ const struct btrfs_raid_attr btrfs_raid_array[BTRFS_NR_RAID_TYPES] = { .tolerated_failures = 1, .devs_increment = 2, .ncopies = 2, + .raid_name = "raid1", }, [BTRFS_RAID_DUP] = { .sub_stripes = 1, @@ -58,6 +60,7 @@ const struct btrfs_raid_attr btrfs_raid_array[BTRFS_NR_RAID_TYPES] = { .tolerated_failures = 0, .devs_increment = 1, .ncopies = 2, + .raid_name = "dup", }, [BTRFS_RAID_RAID0] = { .sub_stripes = 1, @@ -67,6 +70,7 @@ const struct btrfs_raid_attr btrfs_raid_array[BTRFS_NR_RAID_TYPES] = { .tolerated_failures = 0, .devs_increment = 1, .ncopies = 1, + .raid_name = "raid0", }, [BTRFS_RAID_SINGLE] = { .sub_stripes = 1, @@ -76,6 +80,7 @@ const struct btrfs_raid_attr btrfs_raid_array[BTRFS_NR_RAID_TYPES] = { .tolerated_failures = 0, .devs_increment = 1, .ncopies = 1, + .raid_name = "single", }, [BTRFS_RAID_RAID5] = { .sub_stripes = 1, @@ -85,6 +90,7 @@ const struct btrfs_raid_attr btrfs_raid_array[BTRFS_NR_RAID_TYPES] = { .tolerated_failures = 1, .devs_increment = 1, .ncopies = 2, + .raid_name = "raid5", }, [BTRFS_RAID_RAID6] = { .sub_stripes = 1, @@ -94,9 +100,18 @@ const struct btrfs_raid_attr btrfs_raid_array[BTRFS_NR_RAID_TYPES] = { .tolerated_failures = 2, .devs_increment = 1, .ncopies = 3, + .raid_name = "raid6", }, }; +const char *get_raid_name(enum btrfs_raid_types type) +{ + if (type >= BTRFS_NR_RAID_TYPES) + return NULL; + + return btrfs_raid_array[type].raid_name; +} + const u64 btrfs_raid_group[BTRFS_NR_RAID_TYPES] = { [BTRFS_RAID_RAID10] = BTRFS_BLOCK_GROUP_RAID10, [BTRFS_RAID_RAID1] = BTRFS_BLOCK_GROUP_RAID1, |