---

yaml --- r: 131039 b: refs/heads/master c: 3dfdb93 h: refs/heads/master i: 131037: f466cc1 131035: fe666ee 131031: f41a39e 131023: 4ab93a4 131007: 512be15 v: v3
git-mirror · Jan 21, 2009 · b0f0b3a · b0f0b3a
1 parent 5a21fb7
commit b0f0b3a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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);