Commit 48475471 authored by Stefan Behrens's avatar Stefan Behrens Committed by Chris Mason

Btrfs: fix for patch "cleanup: don't check the same thing twice"

Mitch Harder noticed that the patch 3c64a1ab mentioned in the subject
line was causing a kernel BUG() on snapshot deletion.

The patch was wrong. It did not handle cached roots correctly. The
check for root_refs == 0 was removed everywhere where
btrfs_read_fs_root_no_name() had been used to retrieve the root,
because this check was already dealt with in
btrfs_read_fs_root_no_name(). But in the case when the root was
found in the cache, there was no such check.

This patch adds the missing check in the case where the root is
found in the cache.
Reported-by: default avatarMitch Harder <mitch.harder@sabayonlinux.org>
Signed-off-by: default avatarStefan Behrens <sbehrens@giantdisaster.de>
Reviewed-by: default avatarMiao Xie <miaox@cn.fujitsu.com>
Signed-off-by: default avatarJosef Bacik <jbacik@fusionio.com>
Signed-off-by: default avatarChris Mason <chris.mason@fusionio.com>
parent 9d565ba4
...@@ -1584,8 +1584,11 @@ struct btrfs_root *btrfs_read_fs_root_no_name(struct btrfs_fs_info *fs_info, ...@@ -1584,8 +1584,11 @@ struct btrfs_root *btrfs_read_fs_root_no_name(struct btrfs_fs_info *fs_info,
ERR_PTR(-ENOENT); ERR_PTR(-ENOENT);
again: again:
root = btrfs_lookup_fs_root(fs_info, location->objectid); root = btrfs_lookup_fs_root(fs_info, location->objectid);
if (root) if (root) {
if (btrfs_root_refs(&root->root_item) == 0)
return ERR_PTR(-ENOENT);
return root; return root;
}
root = btrfs_read_fs_root(fs_info->tree_root, location); root = btrfs_read_fs_root(fs_info->tree_root, location);
if (IS_ERR(root)) if (IS_ERR(root))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment