From: Josef Bacik Date: Wed, 17 Mar 2010 20:45:56 +0000 (+0000) Subject: Btrfs: fix chunk allocate size calculation X-Git-Tag: v2.6.34-rc4~69^2~4 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=0cad8a1130f77c7c445e3298c0e3593b3c0ef439;p=~shefty%2Frdma-dev.git Btrfs: fix chunk allocate size calculation If the amount of free space left in a device is less than what we think should be the minimum size, just ignore the minimum size and use the amount we have. I ran into this running tests on a 600mb volume, the chunk allocator wouldn't let me allocate the last 52mb of the disk for data because we want to have at least 64mb chunks for data. This patch fixes that problem. Thanks, Signed-off-by: Josef Bacik Signed-off-by: Chris Mason --- diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index bf3bec3e413..9bf1f581b87 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -2244,8 +2244,10 @@ again: do_div(calc_size, stripe_len); calc_size *= stripe_len; } + /* we don't want tiny stripes */ - calc_size = max_t(u64, min_stripe_size, calc_size); + if (!looped) + calc_size = max_t(u64, min_stripe_size, calc_size); do_div(calc_size, stripe_len); calc_size *= stripe_len;