From f3f72863d5571cbb04ddde0416994eada776fb2a Mon Sep 17 00:00:00 2001 From: Miao Xie Date: Fri, 10 Aug 2012 16:14:02 +0800 Subject: Btrfs-progs: fix unresolved ref root message btrfsck misinformed "unresolved ref root" message when there were several snapshots in the file system. The patch(commit cfdd42686c70) tried to fix this bug, but didn't fix it completely. If the metadata was stored in a shared leaf of the tree, the problem would happen again. This patch fixes it by another way, we don't check the relationship of the trees when we traverse the fs/file tree, we just do the check when we merge the snapshot records to the root cache. Signed-off-by: Miao Xie --- btrfsck.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/btrfsck.c b/btrfsck.c index f09a4a41..918d1540 100644 --- a/btrfsck.c +++ b/btrfsck.c @@ -857,13 +857,10 @@ static int process_dir_item(struct btrfs_root *root, key->objectid, key->offset, namebuf, len, filetype, key->type, error); } else if (location.type == BTRFS_ROOT_ITEM_KEY) { - u64 parent = root->objectid; - - if (is_child_root(root, parent, location.objectid)) - add_inode_backref(root_cache, location.objectid, - key->objectid, key->offset, - namebuf, len, filetype, - key->type, error); + add_inode_backref(root_cache, location.objectid, + key->objectid, key->offset, + namebuf, len, filetype, + key->type, error); } else { fprintf(stderr, "warning line %d\n", __LINE__); } @@ -1489,6 +1486,9 @@ static int merge_root_recs(struct btrfs_root *root, remove_cache_extent(src_cache, &node->cache); free(node); + if (!is_child_root(root, root->objectid, rec->ino)) + goto skip; + list_for_each_entry(backref, &rec->backrefs, list) { BUG_ON(backref->found_inode_ref); if (backref->found_dir_item) @@ -1504,6 +1504,7 @@ static int merge_root_recs(struct btrfs_root *root, backref->namelen, BTRFS_DIR_INDEX_KEY, backref->errors); } +skip: free_inode_rec(rec); } return 0; -- cgit v1.2.3