aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYan Zheng <zheng.yan@oracle.com>2009-01-21 10:49:16 -0500
committerChris Mason <chris.mason@oracle.com>2009-01-21 10:49:16 -0500
commit3dfdb9348ada18c74c39b9ae7b115e0594792281 (patch)
tree0ae829011d6c29f61035982bfc115dd037e8242c
parentc6e308713a47527f88a277ee95b7c5d1db80f77b (diff)
Btrfs: fix locking issue in btrfs_remove_block_group
We should hold the block_group_cache_lock while modifying the block groups red-black tree. Thank you, Signed-off-by: Yan Zheng <zheng.yan@oracle.com>
-rw-r--r--fs/btrfs/extent-tree.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index a4e36c38b81e..3bed6a7e4b22 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -5952,9 +5952,11 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans,
5952 path = btrfs_alloc_path(); 5952 path = btrfs_alloc_path();
5953 BUG_ON(!path); 5953 BUG_ON(!path);
5954 5954
5955 btrfs_remove_free_space_cache(block_group); 5955 spin_lock(&root->fs_info->block_group_cache_lock);
5956 rb_erase(&block_group->cache_node, 5956 rb_erase(&block_group->cache_node,
5957 &root->fs_info->block_group_cache_tree); 5957 &root->fs_info->block_group_cache_tree);
5958 spin_unlock(&root->fs_info->block_group_cache_lock);
5959 btrfs_remove_free_space_cache(block_group);
5958 down_write(&block_group->space_info->groups_sem); 5960 down_write(&block_group->space_info->groups_sem);
5959 list_del(&block_group->list); 5961 list_del(&block_group->list);
5960 up_write(&block_group->space_info->groups_sem); 5962 up_write(&block_group->space_info->groups_sem);