From 183b2ebc38c954b9f3221ee9a294113ac5a16396 Mon Sep 17 00:00:00 2001
From: Josef Bacik <josef@redhat.com>
Date: Sat, 2 Jul 2011 21:24:41 +0000
Subject: [PATCH] --- yaml --- r: 254751 b: refs/heads/master c:
 508794eb5ec2a2b832742e78c6766844b10c0c94 h: refs/heads/master i:   254749:
 25594abd17c6355238d65405544b8ea2563069d5   254747:
 f2593501fd5d64462b07755cabb9ceb8d96d2389   254743:
 f180f8029ad4ad8fd54c9b414c50169786db004f   254735:
 a95f2b220852c378ab9fdcdd342177b61ae319f1   254719:
 48ecc375c4994583df18fed4665ca11c4ef17770 v: v3

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

diff --git a/[refs] b/[refs]
index 5ae55d49db68..60952ff76f6f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0942caa373c676dca614ea8352ac77e0270aba73
+refs/heads/master: 508794eb5ec2a2b832742e78c6766844b10c0c94
diff --git a/trunk/fs/btrfs/volumes.c b/trunk/fs/btrfs/volumes.c
index 1efa56e18f9b..19450bc53632 100644
--- a/trunk/fs/btrfs/volumes.c
+++ b/trunk/fs/btrfs/volumes.c
@@ -2098,7 +2098,8 @@ int btrfs_balance(struct btrfs_root *dev_root)
 					   chunk_root->root_key.objectid,
 					   found_key.objectid,
 					   found_key.offset);
-		BUG_ON(ret && ret != -ENOSPC);
+		if (ret && ret != -ENOSPC)
+			goto error;
 		key.offset = found_key.offset - 1;
 	}
 	ret = 0;