---

yaml --- r: 360469 b: refs/heads/master c: 8de972b h: refs/heads/master i: 360467: 915e35d v: v3
git-mirror · Feb 1, 2013 · 167d95b · 167d95b
1 parent a3ea6af
commit 167d95b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ac0f4884eaad28441c6e0f9d1400a08c2149049
+refs/heads/master: 8de972b4faa4be9b2a3c53103e18d86092a5da45
diff --git a/trunk/fs/btrfs/extent-tree.c b/trunk/fs/btrfs/extent-tree.c
@@ -5715,6 +5715,7 @@ static noinline int find_free_extent(struct btrfs_trans_handle *trans,
 		 * lets look there
 		 */
 		if (last_ptr) {
+			unsigned long aligned_cluster;
 			/*
 			 * the refill lock keeps out other
 			 * people trying to start a new cluster
@@ -5781,11 +5782,15 @@ static noinline int find_free_extent(struct btrfs_trans_handle *trans,
 				goto unclustered_alloc;
 			}
 
+			aligned_cluster = max_t(unsigned long,
+						empty_cluster + empty_size,
+					      block_group->full_stripe_len);
+
 			/* allocate a cluster in this block group */
 			ret = btrfs_find_space_cluster(trans, root,
 					       block_group, last_ptr,
 					       search_start, num_bytes,
-					       empty_cluster + empty_size);
+					       aligned_cluster);
 			if (ret == 0) {
 				/*
 				 * now pull our allocation out of this