From 0cf97a5519c2d2a961245e3118e66db2395f10b0 Mon Sep 17 00:00:00 2001
From: Chris Mason <chris.mason@oracle.com>
Date: Mon, 10 Nov 2008 07:26:33 -0500
Subject: [PATCH] --- yaml --- r: 129003 b: refs/heads/master c:
 5b7c3fcc46b5deb8a368d5319cf87c78c2df65fe h: refs/heads/master i:   129001:
 fde1dbfff16fa54085fd8808b802915fc3e1bc09   128999:
 683bad558b0b4f67c0f337003f4dfa4775f331cc v: v3

---
 [refs]                       |  2 +-
 trunk/fs/btrfs/extent-tree.c | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 8a7781adf1b1..48ce9a20fdd3 100644
--- 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
index b92e92c29e3b..2451717d36de 100644
--- 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);