Change cmd_dump to not read in leaf nodes

This commit is contained in:
Kent Overstreet 2020-03-02 15:49:20 -05:00
parent dbb99e492d
commit 14e736e627

View File

@ -59,21 +59,38 @@ static void dump_one_device(struct bch_fs *c, struct bch_dev *ca, int fd)
/* Btree: */ /* Btree: */
for (i = 0; i < BTREE_ID_NR; i++) { for (i = 0; i < BTREE_ID_NR; i++) {
const struct bch_extent_ptr *ptr; const struct bch_extent_ptr *ptr;
struct bkey_ptrs_c ptrs;
struct btree_trans trans; struct btree_trans trans;
struct btree_iter *iter; struct btree_iter *iter;
struct btree *b; struct btree *b;
bch2_trans_init(&trans, c, 0, 0); bch2_trans_init(&trans, c, 0, 0);
for_each_btree_node(&trans, iter, i, POS_MIN, 0, b) { __for_each_btree_node(&trans, iter, i, POS_MIN, 0, 1, 0, b) {
struct bkey_ptrs_c ptrs = struct btree_node_iter iter;
bch2_bkey_ptrs_c(bkey_i_to_s_c(&b->key)); struct bkey u;
struct bkey_s_c k;
for_each_btree_node_key_unpack(b, k, &iter, &u) {
ptrs = bch2_bkey_ptrs_c(k);
bkey_for_each_ptr(ptrs, ptr)
if (ptr->dev == ca->dev_idx)
range_add(&data,
ptr->offset << 9,
btree_bytes(c));
}
}
b = c->btree_roots[i].b;
if (!btree_node_fake(b)) {
ptrs = bch2_bkey_ptrs_c(bkey_i_to_s_c(&b->key));
bkey_for_each_ptr(ptrs, ptr) bkey_for_each_ptr(ptrs, ptr)
if (ptr->dev == ca->dev_idx) if (ptr->dev == ca->dev_idx)
range_add(&data, range_add(&data,
ptr->offset << 9, ptr->offset << 9,
b->written << 9); btree_bytes(c));
} }
bch2_trans_exit(&trans); bch2_trans_exit(&trans);
} }
@ -97,7 +114,7 @@ int cmd_dump(int argc, char *argv[])
opt_set(opts, errors, BCH_ON_ERROR_CONTINUE); opt_set(opts, errors, BCH_ON_ERROR_CONTINUE);
opt_set(opts, fix_errors, FSCK_OPT_YES); opt_set(opts, fix_errors, FSCK_OPT_YES);
while ((opt = getopt(argc, argv, "o:fh")) != -1) while ((opt = getopt(argc, argv, "o:fvh")) != -1)
switch (opt) { switch (opt) {
case 'o': case 'o':
out = optarg; out = optarg;
@ -105,6 +122,9 @@ int cmd_dump(int argc, char *argv[])
case 'f': case 'f':
force = true; force = true;
break; break;
case 'v':
opt_set(opts, verbose, true);
break;
case 'h': case 'h':
dump_usage(); dump_usage();
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);