---

yaml --- r: 189470 b: refs/heads/master c: 0cad8a1 h: refs/heads/master v: v3
git-mirror · Mar 31, 2010 · 73bc4a8 · 73bc4a8
1 parent 5d0d466
commit 73bc4a8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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;