* [PATCH 2/2] Btrfs: make raid attr array more readable
@ 2013-01-16 11:33 Miao Xie
2013-01-16 14:04 ` David Sterba
0 siblings, 1 reply; 3+ messages in thread
From: Miao Xie @ 2013-01-16 11:33 UTC (permalink / raw)
To: Linux Btrfs; +Cc: Liu Bo
As the title said, this patch just make raid attr array more readable.
Cc: Liu Bo <bo.li.liu@oracle.com>
Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
---
fs/btrfs/ctree.h | 10 +++++++++-
fs/btrfs/extent-tree.c | 22 +++++++++-------------
fs/btrfs/volumes.c | 47 +++++++++++++++++++++++++++++++++++++++++------
3 files changed, 59 insertions(+), 20 deletions(-)
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 9ee099f..541ce9a 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -953,7 +953,15 @@ struct btrfs_dev_replace_item {
#define BTRFS_BLOCK_GROUP_DUP (1ULL << 5)
#define BTRFS_BLOCK_GROUP_RAID10 (1ULL << 6)
#define BTRFS_BLOCK_GROUP_RESERVED BTRFS_AVAIL_ALLOC_BIT_SINGLE
-#define BTRFS_NR_RAID_TYPES 5
+
+enum btrfs_raid_types {
+ BTRFS_RAID_RAID10,
+ BTRFS_RAID_RAID1,
+ BTRFS_RAID_DUP,
+ BTRFS_RAID_RAID0,
+ BTRFS_RAID_SINGLE,
+ BTRFS_NR_RAID_TYPES
+};
#define BTRFS_BLOCK_GROUP_TYPE_MASK (BTRFS_BLOCK_GROUP_DATA | \
BTRFS_BLOCK_GROUP_SYSTEM | \
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index e68585d..6de0621 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -5547,20 +5547,16 @@ wait_block_group_cache_done(struct btrfs_block_group_cache *cache)
int __get_raid_index(u64 flags)
{
- int index;
-
if (flags & BTRFS_BLOCK_GROUP_RAID10)
- index = 0;
+ return BTRFS_RAID_RAID10;
else if (flags & BTRFS_BLOCK_GROUP_RAID1)
- index = 1;
+ return BTRFS_RAID_RAID1;
else if (flags & BTRFS_BLOCK_GROUP_DUP)
- index = 2;
+ return BTRFS_RAID_DUP;
else if (flags & BTRFS_BLOCK_GROUP_RAID0)
- index = 3;
+ return BTRFS_RAID_RAID0;
else
- index = 4;
-
- return index;
+ return BTRFS_RAID_SINGLE;
}
static int get_block_group_index(struct btrfs_block_group_cache *cache)
@@ -7520,16 +7516,16 @@ int btrfs_can_relocate(struct btrfs_root *root, u64 bytenr)
index = get_block_group_index(block_group);
}
- if (index == 0) {
+ if (index == BTRFS_RAID_RAID10) {
dev_min = 4;
/* Divide by 2 */
min_free >>= 1;
- } else if (index == 1) {
+ } else if (index == BTRFS_RAID_RAID1) {
dev_min = 2;
- } else if (index == 2) {
+ } else if (index == BTRFS_RAID_DUP) {
/* Multiply by 2 */
min_free <<= 1;
- } else if (index == 3) {
+ } else if (index == BTRFS_RAID_RAID0) {
dev_min = fs_devices->rw_devices;
do_div(min_free, dev_min);
}
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 7fa9773..edc5ee3 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -3492,13 +3492,48 @@ static int btrfs_cmp_device_info(const void *a, const void *b)
}
struct btrfs_raid_attr btrfs_raid_array[BTRFS_NR_RAID_TYPES] = {
- { 2, 1, 0, 4, 2, 2 /* raid10 */ },
- { 1, 1, 2, 2, 2, 2 /* raid1 */ },
- { 1, 2, 1, 1, 1, 2 /* dup */ },
- { 1, 1, 0, 2, 1, 1 /* raid0 */ },
- { 1, 1, 1, 1, 1, 1 /* single */ },
+ [BTRFS_RAID_RAID10] = {
+ .sub_stripes = 2,
+ .dev_stripes = 1,
+ .devs_max = 0, /* 0 == as many as possible */
+ .devs_min = 4,
+ .devs_increment = 2,
+ .ncopies = 2,
+ },
+ [BTRFS_RAID_RAID1] = {
+ .sub_stripes = 1,
+ .dev_stripes = 1,
+ .devs_max = 2,
+ .devs_min = 2,
+ .devs_increment = 2,
+ .ncopies = 2,
+ },
+ [BTRFS_RAID_DUP] = {
+ .sub_stripes = 1,
+ .dev_stripes = 2,
+ .devs_max = 1,
+ .devs_min = 1,
+ .devs_increment = 1,
+ .ncopies = 2,
+ },
+ [BTRFS_RAID_RAID0] = {
+ .sub_stripes = 1,
+ .dev_stripes = 1,
+ .devs_max = 0,
+ .devs_min = 2,
+ .devs_increment = 1,
+ .ncopies = 1,
+ },
+ [BTRFS_RAID_RAID0] = {
+ .sub_stripes = 1,
+ .dev_stripes = 1,
+ .devs_max = 1,
+ .devs_min = 1,
+ .devs_increment = 1,
+ .ncopies = 1,
+ },
};
-
+
static int __btrfs_alloc_chunk(struct btrfs_trans_handle *trans,
struct btrfs_root *extent_root,
struct map_lookup **map_ret,
--
1.7.11.7
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 2/2] Btrfs: make raid attr array more readable
@ 2013-01-16 11:47 Matthias Prager
0 siblings, 0 replies; 3+ messages in thread
From: Matthias Prager @ 2013-01-16 11:47 UTC (permalink / raw)
To: Miao Xie, linux-btrfs, Liu Bo; +Cc: Matthias Prager
One small error (see below):
> As the title said, this patch just make raid attr array more readable.
>
> Cc: Liu Bo <bo.li.liu@oracle.com>
> Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
> ---
> fs/btrfs/ctree.h | 10 +++++++++-
> fs/btrfs/extent-tree.c | 22 +++++++++-------------
> fs/btrfs/volumes.c | 47 +++++++++++++++++++++++++++++++++++++++++------
> 3 files changed, 59 insertions(+), 20 deletions(-)
>
> diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
> index 9ee099f..541ce9a 100644
> --- a/fs/btrfs/ctree.h
> +++ b/fs/btrfs/ctree.h
> @@ -953,7 +953,15 @@ struct btrfs_dev_replace_item {
> #define BTRFS_BLOCK_GROUP_DUP (1ULL << 5)
> #define BTRFS_BLOCK_GROUP_RAID10 (1ULL << 6)
> #define BTRFS_BLOCK_GROUP_RESERVED BTRFS_AVAIL_ALLOC_BIT_SINGLE
> -#define BTRFS_NR_RAID_TYPES 5
> +
> +enum btrfs_raid_types {
> + BTRFS_RAID_RAID10,
> + BTRFS_RAID_RAID1,
> + BTRFS_RAID_DUP,
> + BTRFS_RAID_RAID0,
> + BTRFS_RAID_SINGLE,
> + BTRFS_NR_RAID_TYPES
> +};
>
> #define BTRFS_BLOCK_GROUP_TYPE_MASK (BTRFS_BLOCK_GROUP_DATA | \
> BTRFS_BLOCK_GROUP_SYSTEM | \
> diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
> index e68585d..6de0621 100644
> --- a/fs/btrfs/extent-tree.c
> +++ b/fs/btrfs/extent-tree.c
> @@ -5547,20 +5547,16 @@ wait_block_group_cache_done(struct btrfs_block_group_cache *cache)
>
> int __get_raid_index(u64 flags)
> {
> - int index;
> -
> if (flags & BTRFS_BLOCK_GROUP_RAID10)
> - index = 0;
> + return BTRFS_RAID_RAID10;
> else if (flags & BTRFS_BLOCK_GROUP_RAID1)
> - index = 1;
> + return BTRFS_RAID_RAID1;
> else if (flags & BTRFS_BLOCK_GROUP_DUP)
> - index = 2;
> + return BTRFS_RAID_DUP;
> else if (flags & BTRFS_BLOCK_GROUP_RAID0)
> - index = 3;
> + return BTRFS_RAID_RAID0;
> else
> - index = 4;
> -
> - return index;
> + return BTRFS_RAID_SINGLE;
> }
>
> static int get_block_group_index(struct btrfs_block_group_cache *cache)
> @@ -7520,16 +7516,16 @@ int btrfs_can_relocate(struct btrfs_root *root, u64 bytenr)
> index = get_block_group_index(block_group);
> }
>
> - if (index == 0) {
> + if (index == BTRFS_RAID_RAID10) {
> dev_min = 4;
> /* Divide by 2 */
> min_free >>= 1;
> - } else if (index == 1) {
> + } else if (index == BTRFS_RAID_RAID1) {
> dev_min = 2;
> - } else if (index == 2) {
> + } else if (index == BTRFS_RAID_DUP) {
> /* Multiply by 2 */
> min_free <<= 1;
> - } else if (index == 3) {
> + } else if (index == BTRFS_RAID_RAID0) {
> dev_min = fs_devices->rw_devices;
> do_div(min_free, dev_min);
> }
> diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
> index 7fa9773..edc5ee3 100644
> --- a/fs/btrfs/volumes.c
> +++ b/fs/btrfs/volumes.c
> @@ -3492,13 +3492,48 @@ static int btrfs_cmp_device_info(const void *a, const void *b)
> }
>
> struct btrfs_raid_attr btrfs_raid_array[BTRFS_NR_RAID_TYPES] = {
> - { 2, 1, 0, 4, 2, 2 /* raid10 */ },
> - { 1, 1, 2, 2, 2, 2 /* raid1 */ },
> - { 1, 2, 1, 1, 1, 2 /* dup */ },
> - { 1, 1, 0, 2, 1, 1 /* raid0 */ },
> - { 1, 1, 1, 1, 1, 1 /* single */ },
> + [BTRFS_RAID_RAID10] = {
> + .sub_stripes = 2,
> + .dev_stripes = 1,
> + .devs_max = 0, /* 0 == as many as possible */
> + .devs_min = 4,
> + .devs_increment = 2,
> + .ncopies = 2,
> + },
> + [BTRFS_RAID_RAID1] = {
> + .sub_stripes = 1,
> + .dev_stripes = 1,
> + .devs_max = 2,
> + .devs_min = 2,
> + .devs_increment = 2,
> + .ncopies = 2,
> + },
> + [BTRFS_RAID_DUP] = {
> + .sub_stripes = 1,
> + .dev_stripes = 2,
> + .devs_max = 1,
> + .devs_min = 1,
> + .devs_increment = 1,
> + .ncopies = 2,
> + },
> + [BTRFS_RAID_RAID0] = {
> + .sub_stripes = 1,
> + .dev_stripes = 1,
> + .devs_max = 0,
> + .devs_min = 2,
> + .devs_increment = 1,
> + .ncopies = 1,
> + },
> + [BTRFS_RAID_RAID0] = {
Shouldn't this rather be BTRFS_RAID_SINGLE ?
> + .sub_stripes = 1,
> + .dev_stripes = 1,
> + .devs_max = 1,
> + .devs_min = 1,
> + .devs_increment = 1,
> + .ncopies = 1,
> + },
> };
> -
> +
> static int __btrfs_alloc_chunk(struct btrfs_trans_handle *trans,
> struct btrfs_root *extent_root,
> struct map_lookup **map_ret,
> --
> 1.7.11.7
> --
> To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 2/2] Btrfs: make raid attr array more readable
2013-01-16 11:33 Miao Xie
@ 2013-01-16 14:04 ` David Sterba
0 siblings, 0 replies; 3+ messages in thread
From: David Sterba @ 2013-01-16 14:04 UTC (permalink / raw)
To: Miao Xie; +Cc: Linux Btrfs, Liu Bo
On Wed, Jan 16, 2013 at 07:33:15PM +0800, Miao Xie wrote:
> As the title said, this patch just make raid attr array more readable.
Nice cleanup, thanks.
> --- a/fs/btrfs/volumes.c
> +++ b/fs/btrfs/volumes.c
> @@ -3492,13 +3492,48 @@ static int btrfs_cmp_device_info(const void *a, const void *b)
> }
>
> struct btrfs_raid_attr btrfs_raid_array[BTRFS_NR_RAID_TYPES] = {
> - { 1, 1, 2, 2, 2, 2 /* raid1 */ },
> + [BTRFS_RAID_RAID1] = {
> + .sub_stripes = 1,
> + .dev_stripes = 1,
> + .devs_max = 2,
Unrelated, but I'm curious why is this set to 2 (and was before)? This
will give preference to the same 2 devices as long as there's space, so
the allocator will not spread the data over the device set. I'd expect
the same behaviour as in RAID10 profile here.
> + .devs_min = 2,
> + .devs_increment = 2,
> + .ncopies = 2,
> + },
david
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-01-16 14:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-16 11:47 [PATCH 2/2] Btrfs: make raid attr array more readable Matthias Prager
-- strict thread matches above, loose matches on Subject: below --
2013-01-16 11:33 Miao Xie
2013-01-16 14:04 ` David Sterba
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).