---

yaml --- r: 129003 b: refs/heads/master c: 5b7c3fc h: refs/heads/master i: 129001: fde1dbf 128999: 683bad5 v: v3
git-mirror · Nov 10, 2008 · 0cf97a5 · 0cf97a5
1 parent 2c82bcf
commit 0cf97a5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5f2cc086ccab27ac5252b3883ac004347860b4c7
+refs/heads/master: 5b7c3fcc46b5deb8a368d5319cf87c78c2df65fe
diff --git a/trunk/fs/btrfs/extent-tree.c b/trunk/fs/btrfs/extent-tree.c
@@ -2255,9 +2255,9 @@ static int noinline find_free_extent(struct btrfs_trans_handle *trans,
 		mutex_unlock(&block_group->alloc_mutex);
 new_group_no_lock:
 		last_wanted = 0;
-		if (!allowed_chunk_alloc && loop > 0) {
-			total_needed -= empty_cluster;
-			empty_cluster = 0;
+		if (!allowed_chunk_alloc) {
+			total_needed -= empty_size;
+			empty_size = 0;
 		}
 		/*
 		 * Here's how this works.
@@ -2277,8 +2277,8 @@ static int noinline find_free_extent(struct btrfs_trans_handle *trans,
 			loop++;
 		} else if (loop == 1 && cur == head) {
 
-			total_needed -= empty_cluster;
-			empty_cluster = 0;
+			total_needed -= empty_size;
+			empty_size = 0;
 
 			if (allowed_chunk_alloc && !chunk_alloc_done) {
 				up_read(&space_info->groups_sem);