> -----Original Message----- > From: linux-btrfs-owner@xxxxxxxxxxxxxxx [mailto:linux-btrfs-owner@xxxxxxxxxxxxxxx] > On Behalf Of Qu Wenruo > Sent: Wednesday, January 31, 2018 2:17 PM > To: linux-btrfs@xxxxxxxxxxxxxxx; dsterba@xxxxxxx > Subject: [PATCH] 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@xxxxxxxx> > --- > fs/btrfs/volumes.c | 11 +++++------ > 1 file changed, 5 insertions(+), 6 deletions(-) > > diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index > cb0a8d27661b..90ad716d2b50 100644 > --- a/fs/btrfs/volumes.c > +++ b/fs/btrfs/volumes.c > @@ -4761,18 +4761,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 > + /* > + * 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); > } > > stripe_size = div_u64(stripe_size, dev_stripes); > -- Reviewed-by: Gu Jinxiang <gujx@xxxxxxxxxxxxxx> > 2.16.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a > message to majordomo@xxxxxxxxxxxxxxx More majordomo info at > http://vger.kernel.org/majordomo-info.html > ?韬{.n?????%??檩??w?{.n???{饼?~镶?^n?■???h?璀?｛?夸z罐?+€?zf＂?????i?????_璁?:+v??撸?
