btrfs: volumes: Cleanup stripe size calculation

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>

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index b2a2afe980f9be15e8b10261eb8ae0d3ae33bebb..c5d2954668fe925c33bc30d816ae55f3774079c0 100644 (file)
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -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 */