Commit af01d2e5 authored by Josef Bacik's avatar Josef Bacik Committed by David Sterba
Browse files

btrfs: hold a ref on fs roots while they're in the radix tree 



If the root is sitting in the radix tree, we should probably have a ref
for the radix tree.  Grab a ref on the root when we insert it, and drop
it when it gets deleted.

Reviewed-by: default avatarNikolay Borisov <nborisov@suse.com>
Signed-off-by: default avatarJosef Bacik <josef@toxicpanda.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 4b8b0528

fs/btrfs/disk-io.c

+5 −1
Original line number Diff line number Diff line
@@ -1513,8 +1513,10 @@ int btrfs_insert_fs_root(struct btrfs_fs_info *fs_info, 
	ret = radix_tree_insert(&fs_info->fs_roots_radix,

				(unsigned long)root->root_key.objectid,

				root);

	if (ret == 0)

	if (ret == 0) {

		btrfs_grab_fs_root(root);

		set_bit(BTRFS_ROOT_IN_RADIX, &root->state);

	}

	spin_unlock(&fs_info->fs_roots_radix_lock);

	radix_tree_preload_end();
@@ -3817,6 +3819,8 @@ void btrfs_drop_and_free_fs_root(struct btrfs_fs_info *fs_info, 
	spin_lock(&fs_info->fs_roots_radix_lock);

	radix_tree_delete(&fs_info->fs_roots_radix,

			  (unsigned long)root->root_key.objectid);

	if (test_and_clear_bit(BTRFS_ROOT_IN_RADIX, &root->state))

		btrfs_put_fs_root(root);

	spin_unlock(&fs_info->fs_roots_radix_lock);



	if (btrfs_root_refs(&root->root_item) == 0)