---

yaml --- r: 262227 b: refs/heads/master c: 17e9f79 h: refs/heads/master i: 262225: 9a3ce8b 262223: 6c2068a v: v3
git-mirror · Jul 14, 2011 · 6ca1717 · 6ca1717
1 parent 7da50d0
commit 6ca1717
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1748f843a0190ef4332d03a64263f383af72682b
+refs/heads/master: 17e9f796bd92cddec17d781c459376f82340fa44
diff --git a/trunk/fs/btrfs/volumes.c b/trunk/fs/btrfs/volumes.c
@@ -2061,8 +2061,10 @@ int btrfs_balance(struct btrfs_root *dev_root)
 
 	/* step two, relocate all the chunks */
 	path = btrfs_alloc_path();
-	BUG_ON(!path);
-
+	if (!path) {
+		ret = -ENOMEM;
+		goto error;
+	}
 	key.objectid = BTRFS_FIRST_CHUNK_TREE_OBJECTID;
 	key.offset = (u64)-1;
 	key.type = BTRFS_CHUNK_ITEM_KEY;