diff --git a/[refs] b/[refs]
index cff24ac2ad15..30c29cf7a87e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2b1f55b0f0d0d1a66470ef4ea2696cd5dd741a12
+refs/heads/master: 4434c33c7f233a7ee5dcaf357fbf795818ea8861
diff --git a/trunk/fs/btrfs/extent-tree.c b/trunk/fs/btrfs/extent-tree.c
index 5258923d621f..fe4e11b31a43 100644
--- a/trunk/fs/btrfs/extent-tree.c
+++ b/trunk/fs/btrfs/extent-tree.c
@@ -3157,9 +3157,13 @@ int btrfs_free_block_groups(struct btrfs_fs_info *info)
 		block_group = rb_entry(n, struct btrfs_block_group_cache,
 				       cache_node);
 
+		spin_unlock(&info->block_group_cache_lock);
 		btrfs_remove_free_space_cache(block_group);
+		spin_lock(&info->block_group_cache_lock);
+
 		rb_erase(&block_group->cache_node,
 			 &info->block_group_cache_tree);
+
 		spin_lock(&block_group->space_info->lock);
 		list_del(&block_group->list);
 		spin_unlock(&block_group->space_info->lock);