btrfs-progs: dump-tree: Fix duplicated output when using -t option
authorQu Wenruo <quwenruo@cn.fujitsu.com>
Tue, 14 Mar 2017 05:28:27 +0000 (13:28 +0800)
committerDavid Sterba <dsterba@suse.com>
Thu, 16 Mar 2017 16:02:45 +0000 (17:02 +0100)
When using -t option to output trees not in root tree (chunk/root/log
root), then we output the tree twice.

Fix it

Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.com>
cmds-inspect-dump-tree.c

index 6c6c0e5..2c6bec7 100644 (file)
@@ -371,21 +371,21 @@ again:
        if (tree_id && tree_id == BTRFS_ROOT_TREE_OBJECTID) {
                if (!info->tree_root->node) {
                        error("cannot print root tree, invalid pointer");
-                       goto no_node;
+                       goto close_root;
                }
                printf("root tree\n");
                btrfs_print_tree(info->tree_root, info->tree_root->node, 1);
-               goto no_node;
+               goto close_root;
        }
 
        if (tree_id && tree_id == BTRFS_CHUNK_TREE_OBJECTID) {
                if (!info->chunk_root->node) {
                        error("cannot print chunk tree, invalid pointer");
-                       goto no_node;
+                       goto close_root;
                }
                printf("chunk tree\n");
                btrfs_print_tree(info->chunk_root, info->chunk_root->node, 1);
-               goto no_node;
+               goto close_root;
        }
 
        key.offset = 0;