summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorJosef Bacik <josef@redhat.com>2010-03-17 21:45:56 +0100
committerChris Mason <chris.mason@oracle.com>2010-03-31 03:19:09 +0200
commit0cad8a1130f77c7c445e3298c0e3593b3c0ef439 (patch)
tree1f045f7baccc9dd2c1ac805b94cdedc4bbab618f /fs
parentBtrfs: kill max_extent mount option (diff)
downloadlinux-0cad8a1130f77c7c445e3298c0e3593b3c0ef439.tar.xz
linux-0cad8a1130f77c7c445e3298c0e3593b3c0ef439.zip
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 <josef@redhat.com> Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/btrfs/volumes.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index bf3bec3e4130..9bf1f581b872 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;