projects
/
platform
/
upstream
/
btrfs-progs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Btrfs progs v4.16.1
[platform/upstream/btrfs-progs.git]
/
cmds-inspect-dump-tree.c
diff --git
a/cmds-inspect-dump-tree.c
b/cmds-inspect-dump-tree.c
index
8ff638f
..
92a2a45
100644
(file)
--- a/
cmds-inspect-dump-tree.c
+++ b/
cmds-inspect-dump-tree.c
@@
-33,27
+33,26
@@
#include "utils.h"
#include "help.h"
#include "utils.h"
#include "help.h"
-static void print_extents(struct
btrfs_root *root, struct
extent_buffer *eb)
+static void print_extents(struct extent_buffer *eb)
{
{
+ struct btrfs_fs_info *fs_info = eb->fs_info;
struct extent_buffer *next;
int i;
u32 nr;
struct extent_buffer *next;
int i;
u32 nr;
- u32 size;
if (!eb)
return;
if (btrfs_is_leaf(eb)) {
if (!eb)
return;
if (btrfs_is_leaf(eb)) {
- btrfs_print_leaf(
root,
eb);
+ btrfs_print_leaf(eb);
return;
}
return;
}
- size = root->fs_info->nodesize;
nr = btrfs_header_nritems(eb);
for (i = 0; i < nr; i++) {
nr = btrfs_header_nritems(eb);
for (i = 0; i < nr; i++) {
- next = read_tree_block(
root->
fs_info,
+ next = read_tree_block(fs_info,
btrfs_node_blockptr(eb, i),
btrfs_node_blockptr(eb, i),
-
size,
btrfs_node_ptr_generation(eb, i));
+ btrfs_node_ptr_generation(eb, i));
if (!extent_buffer_uptodate(next))
continue;
if (btrfs_is_leaf(next) && btrfs_header_level(eb) != 1) {
if (!extent_buffer_uptodate(next))
continue;
if (btrfs_is_leaf(next) && btrfs_header_level(eb) != 1) {
@@
-70,7
+69,7
@@
static void print_extents(struct btrfs_root *root, struct extent_buffer *eb)
btrfs_header_level(eb));
goto out;
}
btrfs_header_level(eb));
goto out;
}
- print_extents(
root,
next);
+ print_extents(next);
free_extent_buffer(next);
}
free_extent_buffer(next);
}
@@
-145,7
+144,7
@@
static u64 treeid_from_string(const char *str, const char **end)
{ "CHUNK", BTRFS_CHUNK_TREE_OBJECTID },
{ "DEVICE", BTRFS_DEV_TREE_OBJECTID },
{ "DEV", BTRFS_DEV_TREE_OBJECTID },
{ "CHUNK", BTRFS_CHUNK_TREE_OBJECTID },
{ "DEVICE", BTRFS_DEV_TREE_OBJECTID },
{ "DEV", BTRFS_DEV_TREE_OBJECTID },
- { "FS
_TREE
", BTRFS_FS_TREE_OBJECTID },
+ { "FS", BTRFS_FS_TREE_OBJECTID },
{ "CSUM", BTRFS_CSUM_TREE_OBJECTID },
{ "CHECKSUM", BTRFS_CSUM_TREE_OBJECTID },
{ "QUOTA", BTRFS_QUOTA_TREE_OBJECTID },
{ "CSUM", BTRFS_CSUM_TREE_OBJECTID },
{ "CHECKSUM", BTRFS_CSUM_TREE_OBJECTID },
{ "QUOTA", BTRFS_QUOTA_TREE_OBJECTID },
@@
-200,6
+199,7
@@
const char * const cmd_inspect_dump_tree_usage[] = {
"-u|--uuid print only the uuid tree",
"-b|--block <block_num> print info from the specified block only",
"-t|--tree <tree_id> print only tree with the given id (string or number)",
"-u|--uuid print only the uuid tree",
"-b|--block <block_num> print info from the specified block only",
"-t|--tree <tree_id> print only tree with the given id (string or number)",
+ "--follow use with -b, to show all children tree blocks of <block_num>",
NULL
};
NULL
};
@@
-221,13
+221,23
@@
int cmd_inspect_dump_tree(int argc, char **argv)
int uuid_tree_only = 0;
int roots_only = 0;
int root_backups = 0;
int uuid_tree_only = 0;
int roots_only = 0;
int root_backups = 0;
- unsigned open_ctree_flags
= OPEN_CTREE_FS_PARTIAL
;
+ unsigned open_ctree_flags;
u64 block_only = 0;
struct btrfs_root *tree_root_scan;
u64 tree_id = 0;
u64 block_only = 0;
struct btrfs_root *tree_root_scan;
u64 tree_id = 0;
+ bool follow = false;
+ /*
+ * For debug-tree, we care nothing about extent tree (it's just backref
+ * and usage accounting, only makes sense for RW operations).
+ * Use NO_BLOCK_GROUPS here could also speedup open_ctree() and allow us
+ * to inspect fs with corrupted extent tree blocks, and show as many good
+ * tree blocks as possible.
+ */
+ open_ctree_flags = OPEN_CTREE_PARTIAL | OPEN_CTREE_NO_BLOCK_GROUPS;
while (1) {
int c;
while (1) {
int c;
+ enum { GETOPT_VAL_FOLLOW = 256 };
static const struct option long_options[] = {
{ "extents", no_argument, NULL, 'e'},
{ "device", no_argument, NULL, 'd'},
static const struct option long_options[] = {
{ "extents", no_argument, NULL, 'e'},
{ "device", no_argument, NULL, 'd'},
@@
-236,6
+246,7
@@
int cmd_inspect_dump_tree(int argc, char **argv)
{ "uuid", no_argument, NULL, 'u'},
{ "block", required_argument, NULL, 'b'},
{ "tree", required_argument, NULL, 't'},
{ "uuid", no_argument, NULL, 'u'},
{ "block", required_argument, NULL, 'b'},
{ "tree", required_argument, NULL, 't'},
+ { "follow", no_argument, NULL, GETOPT_VAL_FOLLOW },
{ NULL, 0, NULL, 0 }
};
{ NULL, 0, NULL, 0 }
};
@@
-288,6
+299,9
@@
int cmd_inspect_dump_tree(int argc, char **argv)
}
break;
}
}
break;
}
+ case GETOPT_VAL_FOLLOW:
+ follow = true;
+ break;
default:
usage(cmd_inspect_dump_tree_usage);
}
default:
usage(cmd_inspect_dump_tree_usage);
}
@@
-312,27
+326,21
@@
int cmd_inspect_dump_tree(int argc, char **argv)
if (block_only) {
root = info->chunk_root;
if (block_only) {
root = info->chunk_root;
- leaf = read_tree_block(info,
- block_only,
- info->nodesize, 0);
-
+ leaf = read_tree_block(info, block_only, 0);
if (extent_buffer_uptodate(leaf) &&
btrfs_header_level(leaf) != 0) {
free_extent_buffer(leaf);
leaf = NULL;
}
if (extent_buffer_uptodate(leaf) &&
btrfs_header_level(leaf) != 0) {
free_extent_buffer(leaf);
leaf = NULL;
}
- if (!leaf) {
- leaf = read_tree_block(info,
- block_only,
- info->nodesize, 0);
- }
+ if (!leaf)
+ leaf = read_tree_block(info, block_only, 0);
if (!extent_buffer_uptodate(leaf)) {
error("failed to read %llu",
(unsigned long long)block_only);
goto close_root;
}
if (!extent_buffer_uptodate(leaf)) {
error("failed to read %llu",
(unsigned long long)block_only);
goto close_root;
}
- btrfs_print_tree(
root, leaf, 0
);
+ btrfs_print_tree(
leaf, follow
);
free_extent_buffer(leaf);
goto close_root;
}
free_extent_buffer(leaf);
goto close_root;
}
@@
-359,20
+367,17
@@
int cmd_inspect_dump_tree(int argc, char **argv)
} else {
if (info->tree_root->node) {
printf("root tree\n");
} else {
if (info->tree_root->node) {
printf("root tree\n");
- btrfs_print_tree(info->tree_root,
- info->tree_root->node, 1);
+ btrfs_print_tree(info->tree_root->node, 1);
}
if (info->chunk_root->node) {
printf("chunk tree\n");
}
if (info->chunk_root->node) {
printf("chunk tree\n");
- btrfs_print_tree(info->chunk_root,
- info->chunk_root->node, 1);
+ btrfs_print_tree(info->chunk_root->node, 1);
}
if (info->log_root_tree) {
printf("log root tree\n");
}
if (info->log_root_tree) {
printf("log root tree\n");
- btrfs_print_tree(info->log_root_tree,
- info->log_root_tree->node, 1);
+ btrfs_print_tree(info->log_root_tree->node, 1);
}
}
}
}
}
}
@@
-392,7
+397,7
@@
again:
goto close_root;
}
printf("root tree\n");
goto close_root;
}
printf("root tree\n");
- btrfs_print_tree(info->tree_root
, info->tree_root
->node, 1);
+ btrfs_print_tree(info->tree_root->node, 1);
goto close_root;
}
goto close_root;
}
@@
-402,7
+407,7
@@
again:
goto close_root;
}
printf("chunk tree\n");
goto close_root;
}
printf("chunk tree\n");
- btrfs_print_tree(info->chunk_root
, info->chunk_root
->node, 1);
+ btrfs_print_tree(info->chunk_root->node, 1);
goto close_root;
}
goto close_root;
}
@@
-412,8
+417,7
@@
again:
goto close_root;
}
printf("log root tree\n");
goto close_root;
}
printf("log root tree\n");
- btrfs_print_tree(info->log_root_tree, info->log_root_tree->node,
- 1);
+ btrfs_print_tree(info->log_root_tree->node, 1);
goto close_root;
}
goto close_root;
}
@@
-446,8
+450,7
@@
again:
offset = btrfs_item_ptr_offset(leaf, slot);
read_extent_buffer(leaf, &ri, offset, sizeof(ri));
offset = btrfs_item_ptr_offset(leaf, slot);
read_extent_buffer(leaf, &ri, offset, sizeof(ri));
- buf = read_tree_block(info, btrfs_root_bytenr(&ri),
- info->nodesize, 0);
+ buf = read_tree_block(info, btrfs_root_bytenr(&ri), 0);
if (!extent_buffer_uptodate(buf))
goto next;
if (tree_id && found_key.objectid != tree_id) {
if (!extent_buffer_uptodate(buf))
goto next;
if (tree_id && found_key.objectid != tree_id) {
@@
-550,7
+553,7
@@
again:
printf(" tree ");
btrfs_print_key(&disk_key);
printf("\n");
printf(" tree ");
btrfs_print_key(&disk_key);
printf("\n");
- print_extents(
tree_root_scan,
buf);
+ print_extents(buf);
} else if (!skip) {
printf(" tree ");
btrfs_print_key(&disk_key);
} else if (!skip) {
printf(" tree ");
btrfs_print_key(&disk_key);
@@
-560,7
+563,7
@@
again:
btrfs_header_level(buf));
} else {
printf(" \n");
btrfs_header_level(buf));
} else {
printf(" \n");
- btrfs_print_tree(
tree_root_scan,
buf, 1);
+ btrfs_print_tree(buf, 1);
}
}
free_extent_buffer(buf);
}
}
free_extent_buffer(buf);