---

yaml --- r: 297883 b: refs/heads/master c: 1dd4602 h: refs/heads/master i: 297881: 8925d8e 297879: 39ce7d6 v: v3
git-mirror · Mar 22, 2012 · 6478411 · 6478411
1 parent cb27009
commit 6478411
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2cdcecbc153c222fae1be6f8ddb320b29e3a5200
+refs/heads/master: 1dd4602fa74273c28b3577a58aa389f330e9a0dc
diff --git a/trunk/fs/btrfs/volumes.c b/trunk/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,