struct bch_sb *sb = ca->disk_sb.sb;
ranges data;
unsigned i;
+ int ret;
darray_init(data);
const struct bch_extent_ptr *ptr;
struct bkey_ptrs_c ptrs;
struct btree_trans trans;
- struct btree_iter *iter;
+ struct btree_iter iter;
struct btree *b;
bch2_trans_init(&trans, c, 0, 0);
- __for_each_btree_node(&trans, iter, i, POS_MIN, 0, 1, 0, b) {
+ __for_each_btree_node(&trans, iter, i, POS_MIN, 0, 1, 0, b, ret) {
struct btree_node_iter iter;
struct bkey u;
struct bkey_s_c k;
}
}
+ if (ret)
+ die("error %s walking btree nodes", strerror(-ret));
+
b = c->btree_roots[i].b;
if (!btree_node_fake(b)) {
ptrs = bch2_bkey_ptrs_c(bkey_i_to_s_c(&b->key));
ptr->offset << 9,
btree_bytes(c));
}
+
+ bch2_trans_iter_exit(&trans, &iter);
bch2_trans_exit(&trans);
}
qcow2_write_image(ca->disk_sb.bdev->bd_fd, fd, &data,
max_t(unsigned, btree_bytes(c) / 8, block_bytes(c)));
+ darray_free(data);
}
int cmd_dump(int argc, char *argv[])
opt_set(opts, norecovery, true);
opt_set(opts, degraded, true);
opt_set(opts, errors, BCH_ON_ERROR_continue);
- opt_set(opts, fix_errors, FSCK_OPT_YES);
+ opt_set(opts, fix_errors, FSCK_OPT_NO);
while ((opt = getopt(argc, argv, "o:fvh")) != -1)
switch (opt) {
struct bpos start, struct bpos end)
{
struct btree_trans trans;
- struct btree_iter *iter;
+ struct btree_iter iter;
struct bkey_s_c k;
char buf[512];
int ret;
bch2_trans_init(&trans, c, 0, 0);
for_each_btree_key(&trans, iter, btree_id, start,
+ BTREE_ITER_ALL_SNAPSHOTS|
BTREE_ITER_PREFETCH, k, ret) {
if (bkey_cmp(k.k->p, end) > 0)
break;
bch2_bkey_val_to_text(&PBUF(buf), c, k);
puts(buf);
}
+ bch2_trans_iter_exit(&trans, &iter);
+
bch2_trans_exit(&trans);
}
-static void list_btree_formats(struct bch_fs *c, enum btree_id btree_id,
+static void list_btree_formats(struct bch_fs *c, enum btree_id btree_id, unsigned level,
struct bpos start, struct bpos end)
{
struct btree_trans trans;
- struct btree_iter *iter;
+ struct btree_iter iter;
struct btree *b;
char buf[4096];
+ int ret;
bch2_trans_init(&trans, c, 0, 0);
- for_each_btree_node(&trans, iter, btree_id, start, 0, b) {
+ __for_each_btree_node(&trans, iter, btree_id, start, 0, level, 0, b, ret) {
if (bkey_cmp(b->key.k.p, end) > 0)
break;
bch2_btree_node_to_text(&PBUF(buf), c, b);
puts(buf);
}
+ bch2_trans_iter_exit(&trans, &iter);
+
+ if (ret)
+ die("error %s walking btree nodes", strerror(-ret));
+
bch2_trans_exit(&trans);
}
-static void list_nodes(struct bch_fs *c, enum btree_id btree_id,
- struct bpos start, struct bpos end)
+static void list_nodes(struct bch_fs *c, enum btree_id btree_id, unsigned level,
+ struct bpos start, struct bpos end)
{
struct btree_trans trans;
- struct btree_iter *iter;
+ struct btree_iter iter;
struct btree *b;
char buf[4096];
+ int ret;
bch2_trans_init(&trans, c, 0, 0);
- for_each_btree_node(&trans, iter, btree_id, start, 0, b) {
+ __for_each_btree_node(&trans, iter, btree_id, start, 0, level, 0, b, ret) {
if (bkey_cmp(b->key.k.p, end) > 0)
break;
fputs(buf, stdout);
putchar('\n');
}
+ bch2_trans_iter_exit(&trans, &iter);
+
+ if (ret)
+ die("error %s walking btree nodes", strerror(-ret));
+
bch2_trans_exit(&trans);
}
le64_to_cpu(i->journal_seq));
offset += sectors;
- for (k = i->start;
- k != vstruct_last(i);
- k = bkey_next_skip_noops(k, vstruct_last(i))) {
+ for (k = i->start; k != vstruct_last(i); k = bkey_next(k)) {
struct bkey u;
char buf[4096];
free(n_ondisk);
}
-static void list_nodes_ondisk(struct bch_fs *c, enum btree_id btree_id,
+static void list_nodes_ondisk(struct bch_fs *c, enum btree_id btree_id, unsigned level,
struct bpos start, struct bpos end)
{
struct btree_trans trans;
- struct btree_iter *iter;
+ struct btree_iter iter;
struct btree *b;
char buf[4096];
+ int ret;
bch2_trans_init(&trans, c, 0, 0);
- for_each_btree_node(&trans, iter, btree_id, start, 0, b) {
+ __for_each_btree_node(&trans, iter, btree_id, start, 0, level, 0, b, ret) {
if (bkey_cmp(b->key.k.p, end) > 0)
break;
print_node_ondisk(c, b);
}
+ bch2_trans_iter_exit(&trans, &iter);
+
+ if (ret)
+ die("error %s walking btree nodes", strerror(-ret));
+
bch2_trans_exit(&trans);
}
-static void list_nodes_keys(struct bch_fs *c, enum btree_id btree_id,
+static void list_nodes_keys(struct bch_fs *c, enum btree_id btree_id, unsigned level,
struct bpos start, struct bpos end)
{
struct btree_trans trans;
- struct btree_iter *iter;
+ struct btree_iter iter;
struct btree_node_iter node_iter;
struct bkey unpacked;
struct bkey_s_c k;
struct btree *b;
char buf[4096];
+ int ret;
bch2_trans_init(&trans, c, 0, 0);
- for_each_btree_node(&trans, iter, btree_id, start, 0, b) {
+ __for_each_btree_node(&trans, iter, btree_id, start, 0, level, 0, b, ret) {
if (bkey_cmp(b->key.k.p, end) > 0)
break;
puts(buf);
}
}
+ bch2_trans_iter_exit(&trans, &iter);
+
+ if (ret)
+ die("error %s walking btree nodes", strerror(-ret));
+
bch2_trans_exit(&trans);
}
"\n"
"Options:\n"
" -b (extents|inodes|dirents|xattrs) Btree to list from\n"
+ " -l level Btree depth to descend to (0 == leaves)\n"
" -s inode:offset Start position to list from\n"
" -e inode:offset End position\n"
" -i inode List keys for a given inode number\n"
- " -m (keys|formats) List mode\n"
+ " -m (keys|formats|nodes|nodes_ondisk|nodes_keys)\n"
+ " List mode\n"
" -f Check (fsck) the filesystem first\n"
" -v Verbose mode\n"
" -h Display this help and exit\n"
"Report bugs to <linux-bcache@vger.kernel.org>");
}
+#define LIST_MODES() \
+ x(keys) \
+ x(formats) \
+ x(nodes) \
+ x(nodes_ondisk) \
+ x(nodes_keys)
+
+enum list_modes {
+#define x(n) LIST_MODE_##n,
+ LIST_MODES()
+#undef x
+};
+
static const char * const list_modes[] = {
- "keys",
- "formats",
- "nodes",
- "nodes_ondisk",
- "nodes_keys",
+#define x(n) #n,
+ LIST_MODES()
+#undef x
NULL
};
enum btree_id btree_id_start = 0;
enum btree_id btree_id_end = BTREE_ID_NR;
enum btree_id btree_id;
+ unsigned level = 0;
struct bpos start = POS_MIN, end = POS_MAX;
- u64 inum;
+ u64 inum = 0;
int mode = 0, opt;
opt_set(opts, nochanges, true);
opt_set(opts, degraded, true);
opt_set(opts, errors, BCH_ON_ERROR_continue);
- while ((opt = getopt(argc, argv, "b:s:e:i:m:fvh")) != -1)
+ while ((opt = getopt(argc, argv, "b:l:s:e:i:m:fvh")) != -1)
switch (opt) {
case 'b':
btree_id_start = read_string_list_or_die(optarg,
bch2_btree_ids, "btree id");
btree_id_end = btree_id_start + 1;
break;
+ case 'l':
+ if (kstrtouint(optarg, 10, &level) || level >= BTREE_MAX_DEPTH)
+ die("invalid level");
+ break;
case 's':
start = bpos_parse(optarg);
break;
btree_id < btree_id_end;
btree_id++) {
switch (mode) {
- case 0:
+ case LIST_MODE_keys:
list_keys(c, btree_id, start, end);
break;
- case 1:
- list_btree_formats(c, btree_id, start, end);
+ case LIST_MODE_formats:
+ list_btree_formats(c, btree_id, level, start, end);
break;
- case 2:
- list_nodes(c, btree_id, start, end);
+ case LIST_MODE_nodes:
+ list_nodes(c, btree_id, level, start, end);
break;
- case 3:
- list_nodes_ondisk(c, btree_id, start, end);
+ case LIST_MODE_nodes_ondisk:
+ list_nodes_ondisk(c, btree_id, level, start, end);
break;
- case 4:
- list_nodes_keys(c, btree_id, start, end);
+ case LIST_MODE_nodes_keys:
+ list_nodes_keys(c, btree_id, level, start, end);
break;
default:
die("Invalid mode");
projects / bcachefs-tools-debian / blobdiff