diff options
author | Dimitri John Ledkov <xnox@ubuntu.com> | 2017-07-31 14:54:24 +0100 |
---|---|---|
committer | Dimitri John Ledkov <xnox@ubuntu.com> | 2017-07-31 14:54:24 +0100 |
commit | 6a0440391da7a99ffab94ccc66264af9b5f3ce34 (patch) | |
tree | 1c7cf4f07b08c4965ab19819ebce367be16fb980 /cmds-inspect-dump-tree.c | |
parent | 5f2e2384443a09e3f1fec71940e9e32b70789102 (diff) |
New upstream release.
Diffstat (limited to 'cmds-inspect-dump-tree.c')
-rw-r--r-- | cmds-inspect-dump-tree.c | 50 |
1 files changed, 36 insertions, 14 deletions
diff --git a/cmds-inspect-dump-tree.c b/cmds-inspect-dump-tree.c index df7be617..93dff086 100644 --- a/cmds-inspect-dump-tree.c +++ b/cmds-inspect-dump-tree.c @@ -32,6 +32,7 @@ #include "commands.h" #include "utils.h" #include "cmds-inspect-dump-tree.h" +#include "help.h" static void print_extents(struct btrfs_root *root, struct extent_buffer *eb) { @@ -48,10 +49,11 @@ static void print_extents(struct btrfs_root *root, struct extent_buffer *eb) return; } - size = root->nodesize; + size = root->fs_info->nodesize; nr = btrfs_header_nritems(eb); for (i = 0; i < nr; i++) { - next = read_tree_block(root, btrfs_node_blockptr(eb, i), + next = read_tree_block(root->fs_info, + btrfs_node_blockptr(eb, i), size, btrfs_node_ptr_generation(eb, i)); if (!extent_buffer_uptodate(next)) continue; @@ -310,9 +312,9 @@ int cmd_inspect_dump_tree(int argc, char **argv) } if (block_only) { - leaf = read_tree_block(root, + leaf = read_tree_block(info, block_only, - root->nodesize, 0); + info->nodesize, 0); if (extent_buffer_uptodate(leaf) && btrfs_header_level(leaf) != 0) { @@ -321,9 +323,9 @@ int cmd_inspect_dump_tree(int argc, char **argv) } if (!leaf) { - leaf = read_tree_block(root, + leaf = read_tree_block(info, block_only, - root->nodesize, 0); + info->nodesize, 0); } if (!extent_buffer_uptodate(leaf)) { error("failed to read %llu", @@ -343,6 +345,11 @@ int cmd_inspect_dump_tree(int argc, char **argv) printf("chunk tree: %llu level %d\n", (unsigned long long)info->chunk_root->node->start, btrfs_header_level(info->chunk_root->node)); + if (info->log_root_tree) + printf("log root tree: %llu level %d\n", + info->log_root_tree->node->start, + btrfs_header_level( + info->log_root_tree->node)); } else { if (info->tree_root->node) { printf("root tree\n"); @@ -355,6 +362,12 @@ int cmd_inspect_dump_tree(int argc, char **argv) btrfs_print_tree(info->chunk_root, info->chunk_root->node, 1); } + + if (info->log_root_tree) { + printf("log root tree\n"); + btrfs_print_tree(info->log_root_tree, + info->log_root_tree->node, 1); + } } } tree_root_scan = info->tree_root; @@ -370,21 +383,32 @@ 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; + } + + if (tree_id && tree_id == BTRFS_TREE_LOG_OBJECTID) { + if (!info->log_root_tree) { + error("cannot print log root tree, invalid pointer"); + goto close_root; + } + printf("log root tree\n"); + btrfs_print_tree(info->log_root_tree, info->log_root_tree->node, + 1); + goto close_root; } key.offset = 0; @@ -416,10 +440,8 @@ again: offset = btrfs_item_ptr_offset(leaf, slot); read_extent_buffer(leaf, &ri, offset, sizeof(ri)); - buf = read_tree_block(tree_root_scan, - btrfs_root_bytenr(&ri), - tree_root_scan->nodesize, - 0); + buf = read_tree_block(info, btrfs_root_bytenr(&ri), + info->nodesize, 0); if (!extent_buffer_uptodate(buf)) goto next; if (tree_id && found_key.objectid != tree_id) { |