From: Mark Fasheh <mfasheh@suse.de>
Date: Fri, 9 Sep 2011 00:29:00 +0000 (-0700)
Subject: btrfs: Remove BUG_ON from __btrfs_alloc_chunk()
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1dd4602fa74273c28b3577a58aa389f330e9a0dc;p=mv-sheeva.git

btrfs: Remove BUG_ON from __btrfs_alloc_chunk()

We BUG_ON() error from add_extent_mapping(), but that error looks pretty
easy to bubble back up - as far as I can tell there have not been any
permanent modifications to fs state at that point.

Signed-off-by: Mark Fasheh <mfasheh@suse.de>
---

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 281ff354f64..f002973959d 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -3327,8 +3327,9 @@ static int __btrfs_alloc_chunk(struct btrfs_trans_handle *trans,
 	write_lock(&em_tree->lock);
 	ret = add_extent_mapping(em_tree, em);
 	write_unlock(&em_tree->lock);
-	BUG_ON(ret);
 	free_extent_map(em);
+	if (ret)
+		goto error;
 
 	ret = btrfs_make_block_group(trans, extent_root, 0, type,
 				     BTRFS_FIRST_CHUNK_TREE_OBJECTID,