aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorChris Mason <chris.mason@oracle.com>2008-09-24 12:50:10 -0400
committerChris Mason <chris.mason@oracle.com>2008-09-25 15:41:59 -0400
commit4434c33c7f233a7ee5dcaf357fbf795818ea8861 (patch)
tree76ba6f9d94368b176aff788a29449fe759512043 /fs
parent2b1f55b0f0d0d1a66470ef4ea2696cd5dd741a12 (diff)
Btrfs: fix sleep with spinlock held during unmount
The code to free block groups needs to drop the space info spin lock before calling btrfs_remove_free_space_cache (which can schedule). This is safe because at unmount time, nobody else is going to play with the block groups. Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/btrfs/extent-tree.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 5258923d621f..fe4e11b31a43 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -3157,9 +3157,13 @@ int btrfs_free_block_groups(struct btrfs_fs_info *info)
3157 block_group = rb_entry(n, struct btrfs_block_group_cache, 3157 block_group = rb_entry(n, struct btrfs_block_group_cache,
3158 cache_node); 3158 cache_node);
3159 3159
3160 spin_unlock(&info->block_group_cache_lock);
3160 btrfs_remove_free_space_cache(block_group); 3161 btrfs_remove_free_space_cache(block_group);
3162 spin_lock(&info->block_group_cache_lock);
3163
3161 rb_erase(&block_group->cache_node, 3164 rb_erase(&block_group->cache_node,
3162 &info->block_group_cache_tree); 3165 &info->block_group_cache_tree);
3166
3163 spin_lock(&block_group->space_info->lock); 3167 spin_lock(&block_group->space_info->lock);
3164 list_del(&block_group->list); 3168 list_del(&block_group->list);
3165 spin_unlock(&block_group->space_info->lock); 3169 spin_unlock(&block_group->space_info->lock);