From d0d7d0b34eebcbe06966d48a91f9198b95adbd86 Mon Sep 17 00:00:00 2001 From: "Yan, Zheng" Date: Mon, 31 May 2010 09:04:46 +0000 Subject: [PATCH] --- yaml --- r: 200355 b: refs/heads/master c: 3bf84a5a834d13e7c5c3e8e5b5c6b26012118dd8 h: refs/heads/master i: 200353: 609f19e62675154ba7ac3079f31b855a484f1e01 200351: d20f7437099073129594e122a3791e2206165430 v: v3 --- [refs] | 2 +- trunk/fs/btrfs/extent-tree.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a340ae5fd632..ef7cc21b7d2d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 046f264f6b3b2cf7e5a1769fc92335d8a9316282 +refs/heads/master: 3bf84a5a834d13e7c5c3e8e5b5c6b26012118dd8 diff --git a/trunk/fs/btrfs/extent-tree.c b/trunk/fs/btrfs/extent-tree.c index 6c14101506e1..a46b64de8f02 100644 --- a/trunk/fs/btrfs/extent-tree.c +++ b/trunk/fs/btrfs/extent-tree.c @@ -4360,7 +4360,8 @@ void btrfs_free_tree_block(struct btrfs_trans_handle *trans, block_rsv = get_block_rsv(trans, root); cache = btrfs_lookup_block_group(root->fs_info, buf->start); - BUG_ON(block_rsv->space_info != cache->space_info); + if (block_rsv->space_info != cache->space_info) + goto out; if (btrfs_header_generation(buf) == trans->transid) { if (root->root_key.objectid != BTRFS_TREE_LOG_OBJECTID) {