From 6478411c105ceae46a6041ea606ab5642a2c1d23 Mon Sep 17 00:00:00 2001 From: Mark Fasheh Date: Thu, 8 Sep 2011 17:29:00 -0700 Subject: [PATCH] --- yaml --- r: 297883 b: refs/heads/master c: 1dd4602fa74273c28b3577a58aa389f330e9a0dc h: refs/heads/master i: 297881: 8925d8ec7162a0178b669296b8db717fcaf090f0 297879: 39ce7d6e0c263a8b690d03571c8e553055947eac v: v3 --- [refs] | 2 +- trunk/fs/btrfs/volumes.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index abfcf72838bf..4bd5a6d26d89 100644 --- 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 index 281ff354f64f..f002973959d0 100644 --- 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,