]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
Btrfs: fix sleep with spinlock held during unmount
authorChris Mason <chris.mason@oracle.com>
Wed, 24 Sep 2008 16:50:10 +0000 (12:50 -0400)
committerChris Mason <chris.mason@oracle.com>
Thu, 25 Sep 2008 19:41:59 +0000 (15:41 -0400)
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>
fs/btrfs/extent-tree.c

index 5258923d621f0b3030deba2cf9a5451d38711d3c..fe4e11b31a43898a64aec09db50667e488cb853e 100644 (file)
@@ -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);