From 73bc4a885f55de5709b6931178ee7ce59a8fa5fa Mon Sep 17 00:00:00 2001
From: Josef Bacik <josef@redhat.com>
Date: Wed, 17 Mar 2010 20:45:56 +0000
Subject: [PATCH] --- yaml --- r: 189470 b: refs/heads/master c:
 0cad8a1130f77c7c445e3298c0e3593b3c0ef439 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/fs/btrfs/volumes.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 71fa9142945c..ded360a095fc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 287a0ab91d25ca982f895a76402e5893b47ed7a6
+refs/heads/master: 0cad8a1130f77c7c445e3298c0e3593b3c0ef439
diff --git a/trunk/fs/btrfs/volumes.c b/trunk/fs/btrfs/volumes.c
index bf3bec3e4130..9bf1f581b872 100644
--- a/trunk/fs/btrfs/volumes.c
+++ b/trunk/fs/btrfs/volumes.c
@@ -2244,8 +2244,10 @@ static int __btrfs_alloc_chunk(struct btrfs_trans_handle *trans,
 		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;