| Message ID | 1499935536-25223-1-git-send-email-nborisov@suse.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 13.07.2017 11:45, Nikolay Borisov wrote: > find_raid56_stripe_len statically returns SZ_64K which equals BTRFS_STRIPE_LEN. > It's sole caller is __btrfs_alloc_chunk and it assigns the return value to ai > variable which is already set to BTRFS_STRIPE_LEN. So remove the function > invocation altogether and remove the function itself. Also remove the variable > since it's only aliasing BTRFS_STRIPE_LEN and use the define directly. > > Signed-off-by: Nikolay Borisov <nborisov@suse.com> I thought the mail server ate this patch hence I resent it. It's identical to the initial posting so ignore it. -- 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
On 2017年07月13日 16:45, Nikolay Borisov wrote: > find_raid56_stripe_len statically returns SZ_64K which equals BTRFS_STRIPE_LEN. > It's sole caller is __btrfs_alloc_chunk and it assigns the return value to ai > variable which is already set to BTRFS_STRIPE_LEN. So remove the function > invocation altogether and remove the function itself. Also remove the variable > since it's only aliasing BTRFS_STRIPE_LEN and use the define directly. > > Signed-off-by: Nikolay Borisov <nborisov@suse.com> > --- > fs/btrfs/volumes.c | 28 ++++++++-------------------- > 1 file changed, 8 insertions(+), 20 deletions(-) > > diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c > index 171a8e79332f..8d7c28a95a90 100644 > --- a/fs/btrfs/volumes.c > +++ b/fs/btrfs/volumes.c > @@ -4594,12 +4594,6 @@ static int btrfs_cmp_device_info(const void *a, const void *b) > return 0; > } > > -static u32 find_raid56_stripe_len(u32 data_devices, u32 dev_stripe_target) > -{ > - /* TODO allow them to set a preferred stripe size */ > - return SZ_64K; > -} > - > static void check_raid56_incompat_flag(struct btrfs_fs_info *info, u64 type) > { > if (!(type & BTRFS_BLOCK_GROUP_RAID56_MASK)) > @@ -4642,7 +4636,6 @@ static int __btrfs_alloc_chunk(struct btrfs_trans_handle *trans, > u64 max_chunk_size; > u64 stripe_size; > u64 num_bytes; > - u64 raid_stripe_len = BTRFS_STRIPE_LEN; > int ndevs; > int i; > int j; > @@ -4784,16 +4777,11 @@ static int __btrfs_alloc_chunk(struct btrfs_trans_handle *trans, > */ > data_stripes = num_stripes / ncopies; > > - if (type & BTRFS_BLOCK_GROUP_RAID5) { > - raid_stripe_len = find_raid56_stripe_len(ndevs - 1, > - info->stripesize); > + if (type & BTRFS_BLOCK_GROUP_RAID5) > data_stripes = num_stripes - 1; > - } > - if (type & BTRFS_BLOCK_GROUP_RAID6) { > - raid_stripe_len = find_raid56_stripe_len(ndevs - 2, > - info->stripesize); > + > + if (type & BTRFS_BLOCK_GROUP_RAID6) > data_stripes = num_stripes - 2; > - } > > /* > * Use the number of data stripes to figure out how big this chunk > @@ -4818,8 +4806,8 @@ static int __btrfs_alloc_chunk(struct btrfs_trans_handle *trans, > stripe_size = div_u64(stripe_size, dev_stripes); > > /* align to BTRFS_STRIPE_LEN */ > - stripe_size = div64_u64(stripe_size, raid_stripe_len); > - stripe_size *= raid_stripe_len; > + stripe_size = div64_u64(stripe_size, BTRFS_STRIPE_LEN); > + stripe_size *= BTRFS_STRIPE_LEN; The old code assumes raid_stripe_len can be other value, which may not be power of 2. So it uses division then multiple to do alignment. Now @raid_stripe_len is fixed to BTRFS_STRIPE_LEN, which is 64K and power of 2, so what about using round_down() macro? Thanks, Qu > > map = kmalloc(map_lookup_size(num_stripes), GFP_NOFS); > if (!map) { > @@ -4837,9 +4825,9 @@ static int __btrfs_alloc_chunk(struct btrfs_trans_handle *trans, > } > } > map->sector_size = info->sectorsize; > - map->stripe_len = raid_stripe_len; > - map->io_align = raid_stripe_len; > - map->io_width = raid_stripe_len; > + map->stripe_len = BTRFS_STRIPE_LEN; > + map->io_align = BTRFS_STRIPE_LEN; > + map->io_width = BTRFS_STRIPE_LEN; > map->type = type; > map->sub_stripes = sub_stripes; > > -- 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
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 171a8e79332f..8d7c28a95a90 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -4594,12 +4594,6 @@ static int btrfs_cmp_device_info(const void *a, const void *b) return 0; } -static u32 find_raid56_stripe_len(u32 data_devices, u32 dev_stripe_target) -{ - /* TODO allow them to set a preferred stripe size */ - return SZ_64K; -} - static void check_raid56_incompat_flag(struct btrfs_fs_info *info, u64 type) { if (!(type & BTRFS_BLOCK_GROUP_RAID56_MASK)) @@ -4642,7 +4636,6 @@ static int __btrfs_alloc_chunk(struct btrfs_trans_handle *trans, u64 max_chunk_size; u64 stripe_size; u64 num_bytes; - u64 raid_stripe_len = BTRFS_STRIPE_LEN; int ndevs; int i; int j; @@ -4784,16 +4777,11 @@ static int __btrfs_alloc_chunk(struct btrfs_trans_handle *trans, */ data_stripes = num_stripes / ncopies; - if (type & BTRFS_BLOCK_GROUP_RAID5) { - raid_stripe_len = find_raid56_stripe_len(ndevs - 1, - info->stripesize); + if (type & BTRFS_BLOCK_GROUP_RAID5) data_stripes = num_stripes - 1; - } - if (type & BTRFS_BLOCK_GROUP_RAID6) { - raid_stripe_len = find_raid56_stripe_len(ndevs - 2, - info->stripesize); + + if (type & BTRFS_BLOCK_GROUP_RAID6) data_stripes = num_stripes - 2; - } /* * Use the number of data stripes to figure out how big this chunk @@ -4818,8 +4806,8 @@ static int __btrfs_alloc_chunk(struct btrfs_trans_handle *trans, stripe_size = div_u64(stripe_size, dev_stripes); /* align to BTRFS_STRIPE_LEN */ - stripe_size = div64_u64(stripe_size, raid_stripe_len); - stripe_size *= raid_stripe_len; + stripe_size = div64_u64(stripe_size, BTRFS_STRIPE_LEN); + stripe_size *= BTRFS_STRIPE_LEN; map = kmalloc(map_lookup_size(num_stripes), GFP_NOFS); if (!map) { @@ -4837,9 +4825,9 @@ static int __btrfs_alloc_chunk(struct btrfs_trans_handle *trans, } } map->sector_size = info->sectorsize; - map->stripe_len = raid_stripe_len; - map->io_align = raid_stripe_len; - map->io_width = raid_stripe_len; + map->stripe_len = BTRFS_STRIPE_LEN; + map->io_align = BTRFS_STRIPE_LEN; + map->io_width = BTRFS_STRIPE_LEN; map->type = type; map->sub_stripes = sub_stripes;
find_raid56_stripe_len statically returns SZ_64K which equals BTRFS_STRIPE_LEN. It's sole caller is __btrfs_alloc_chunk and it assigns the return value to ai variable which is already set to BTRFS_STRIPE_LEN. So remove the function invocation altogether and remove the function itself. Also remove the variable since it's only aliasing BTRFS_STRIPE_LEN and use the define directly. Signed-off-by: Nikolay Borisov <nborisov@suse.com> --- fs/btrfs/volumes.c | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-)