leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

btrfs: volumes: Cleanup stripe size calculation

Browse Source 
Cleanup the following things:
1) open coded SZ_16M round up
2) use min() to replace open-coded size comparison
3) code style

Signed-off-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: Gu Jinxiang <gujx@cn.fujitsu.com>
[ reformat comment ]
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Qu Wenruo 2018-01-31 14:16:34 +08:00 committed by David Sterba
parent da07d4ab33
commit 793ff2c88c
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fs/btrfs/volumes.c
View File

@ -4874,18 +4874,17 @@ static int __btrfs_alloc_chunk(struct btrfs_trans_handle *trans,
* and compare that answer with the max chunk size * and compare that answer with the max chunk size
*/ */
if (stripe_size * data_stripes > max_chunk_size) { if (stripe_size * data_stripes > max_chunk_size) {
u64 mask = (1ULL << 24) - 1;
stripe_size = div_u64(max_chunk_size, data_stripes); stripe_size = div_u64(max_chunk_size, data_stripes);
/* bump the answer up to a 16MB boundary */ /* bump the answer up to a 16MB boundary */
stripe_size = (stripe_size + mask) & ~mask; stripe_size = round_up(stripe_size, SZ_16M);
/* but don't go higher than the limits we found /*
* while searching for free extents * But don't go higher than the limits we found while searching
* for free extents
*/ */
if (stripe_size > devices_info[ndevs-1].max_avail) stripe_size = min(devices_info[ndevs - 1].max_avail,
stripe_size = devices_info[ndevs-1].max_avail; stripe_size);
} }
/* align to BTRFS_STRIPE_LEN */ /* align to BTRFS_STRIPE_LEN */