RepoMirrors
/
btrfs-progs
mirror of https://github.com/kdave/btrfs-progs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Btrfs-progs: re-search tree root if it changes 

If we change something while scanning fs-roots we need to redo our search so
that we get valid root items and have valid root cache.  Thanks,

Signed-off-by: Josef Bacik <jbacik@fb.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
This commit is contained in:
Josef Bacik 2014-10-10 16:57:12 -04:00 committed by David Sterba
parent a8e9c9a65b
commit 994ce2672d
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmds-check.c
View File

@ -2237,7 +2237,7 @@ static int check_fs_roots(struct btrfs_root *root,
struct btrfs_path path; struct btrfs_path path;
struct btrfs_key key; struct btrfs_key key;
struct walk_control wc; struct walk_control wc;
struct extent_buffer *leaf; struct extent_buffer *leaf, *tree_node;
struct btrfs_root *tmp_root; struct btrfs_root *tmp_root;
struct btrfs_root *tree_root = root->fs_info->tree_root; struct btrfs_root *tree_root = root->fs_info->tree_root;
int ret; int ret;
@ -2253,6 +2253,7 @@ static int check_fs_roots(struct btrfs_root *root,
cache_tree_init(&wc.shared); cache_tree_init(&wc.shared);
btrfs_init_path(&path); btrfs_init_path(&path);
again:
key.offset = 0; key.offset = 0;
key.objectid = 0; key.objectid = 0;
key.type = BTRFS_ROOT_ITEM_KEY; key.type = BTRFS_ROOT_ITEM_KEY;
@ -2261,7 +2262,13 @@ static int check_fs_roots(struct btrfs_root *root,
err = 1; err = 1;
goto out; goto out;
} }
tree_node = tree_root->node;
while (1) { while (1) {
if (tree_node != tree_root->node) {
free_root_recs_tree(root_cache);
btrfs_release_path(&path);
goto again;
}
leaf = path.nodes[0]; leaf = path.nodes[0];
if (path.slots[0] >= btrfs_header_nritems(leaf)) { if (path.slots[0] >= btrfs_header_nritems(leaf)) {
ret = btrfs_next_leaf(tree_root, &path); ret = btrfs_next_leaf(tree_root, &path);