Skip to content

Commit

Permalink
btrfs: volumes: Cleanup stripe size calculation
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Qu Wenruo authored and David Sterba committed Mar 26, 2018
1 parent da07d4a commit 793ff2c
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions fs/btrfs/volumes.c
Original file line number Diff line number Diff line change
Expand Up @@ -4874,18 +4874,17 @@ static int __btrfs_alloc_chunk(struct btrfs_trans_handle *trans,
* and compare that answer with the 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);

/* 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 = devices_info[ndevs-1].max_avail;
stripe_size = min(devices_info[ndevs - 1].max_avail,
stripe_size);
}

/* align to BTRFS_STRIPE_LEN */
Expand Down

0 comments on commit 793ff2c

Please sign in to comment.