From b0f0b3acca07421562b142a41b9f7af9e2f3f04d Mon Sep 17 00:00:00 2001 From: Yan Zheng Date: Wed, 21 Jan 2009 10:49:16 -0500 Subject: [PATCH] --- yaml --- r: 131039 b: refs/heads/master c: 3dfdb9348ada18c74c39b9ae7b115e0594792281 h: refs/heads/master i: 131037: f466cc1b6d27168e05355a1b7aff2717ae5e7ce0 131035: fe666ee6fd632e58fb346baa6dd08af430ca18ec 131031: f41a39ec4cf0295b9acb0443137269e6693d6718 131023: 4ab93a4553c5899a340dcc549ac987052493c83f 131007: 512be15cfd81ac616527bb2dac4a55d758802d37 v: v3 --- [refs] | 2 +- trunk/fs/btrfs/extent-tree.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index da94d05e2d86..6b63dff50906 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c6e308713a47527f88a277ee95b7c5d1db80f77b +refs/heads/master: 3dfdb9348ada18c74c39b9ae7b115e0594792281 diff --git a/trunk/fs/btrfs/extent-tree.c b/trunk/fs/btrfs/extent-tree.c index a4e36c38b81e..3bed6a7e4b22 100644 --- a/trunk/fs/btrfs/extent-tree.c +++ b/trunk/fs/btrfs/extent-tree.c @@ -5952,9 +5952,11 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans, path = btrfs_alloc_path(); BUG_ON(!path); - btrfs_remove_free_space_cache(block_group); + spin_lock(&root->fs_info->block_group_cache_lock); rb_erase(&block_group->cache_node, &root->fs_info->block_group_cache_tree); + spin_unlock(&root->fs_info->block_group_cache_lock); + btrfs_remove_free_space_cache(block_group); down_write(&block_group->space_info->groups_sem); list_del(&block_group->list); up_write(&block_group->space_info->groups_sem);