X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=cmd_debug.c;h=e11d495c544fd9e53ad67812a75e93fe30adc1a8;hb=08ce726f9cefd0132e9c54e1e676cfc10a28a0ff;hp=974e862e2eab107293cdb08c72d52946c424716b;hpb=e004b95b88ae95cf7bb26bd7dc80c5dcf2b2664a;p=bcachefs-tools-debian diff --git a/cmd_debug.c b/cmd_debug.c index 974e862..e11d495 100644 --- a/cmd_debug.c +++ b/cmd_debug.c @@ -8,14 +8,14 @@ #include "qcow2.h" #include "tools-util.h" -#include "bcachefs.h" -#include "alloc.h" -#include "btree_cache.h" -#include "btree_iter.h" -#include "buckets.h" -#include "error.h" -#include "journal.h" -#include "super.h" +#include "libbcachefs/bcachefs.h" +#include "libbcachefs/bset.h" +#include "libbcachefs/btree_cache.h" +#include "libbcachefs/btree_iter.h" +#include "libbcachefs/buckets.h" +#include "libbcachefs/error.h" +#include "libbcachefs/journal.h" +#include "libbcachefs/super.h" static void dump_usage(void) { @@ -24,6 +24,7 @@ static void dump_usage(void) "\n" "Options:\n" " -o output Output qcow2 image(s)\n" + " -f Force; overwrite when needed\n" " -h Display this help and exit\n" "Report bugs to "); } @@ -55,19 +56,16 @@ static void dump_one_device(struct bch_fs *c, struct bch_dev *ca, int fd) bucket_bytes(ca)); } - /* Prios/gens: */ - for (i = 0; i < prio_buckets(ca); i++) - range_add(&data, - bucket_bytes(ca) * ca->prio_last_buckets[i], - bucket_bytes(ca)); - /* Btree: */ for (i = 0; i < BTREE_ID_NR; i++) { const struct bch_extent_ptr *ptr; - struct btree_iter iter; + struct btree_trans trans; + struct btree_iter *iter; struct btree *b; - for_each_btree_node(&iter, c, i, POS_MIN, 0, b) { + bch2_trans_init(&trans, c, 0, 0); + + for_each_btree_node(&trans, iter, i, POS_MIN, 0, b) { struct bkey_s_c_extent e = bkey_i_to_s_c_extent(&b->key); extent_for_each_ptr(e, ptr) @@ -76,7 +74,7 @@ static void dump_one_device(struct bch_fs *c, struct bch_dev *ca, int fd) ptr->offset << 9, b->written << 9); } - bch2_btree_iter_unlock(&iter); + bch2_trans_exit(&trans); } qcow2_write_image(ca->disk_sb.bdev->bd_fd, fd, &data, @@ -86,17 +84,17 @@ static void dump_one_device(struct bch_fs *c, struct bch_dev *ca, int fd) int cmd_dump(int argc, char *argv[]) { struct bch_opts opts = bch2_opts_empty(); - struct bch_fs *c = NULL; struct bch_dev *ca; - const char *err; char *out = NULL; unsigned i, nr_devices = 0; bool force = false; int fd, opt; - opts.nochanges = true; - opts.noreplay = true; - opts.errors = BCH_ON_ERROR_CONTINUE; + opt_set(opts, nochanges, true); + 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); while ((opt = getopt(argc, argv, "o:fh")) != -1) switch (opt) { @@ -110,16 +108,17 @@ int cmd_dump(int argc, char *argv[]) dump_usage(); exit(EXIT_SUCCESS); } - - if (optind >= argc) - die("Please supply device(s) to check"); + args_shift(optind); if (!out) die("Please supply output filename"); - err = bch2_fs_open(argv + optind, argc - optind, opts, &c); - if (err) - die("error opening %s: %s", argv[optind], err); + if (!argc) + die("Please supply device(s) to check"); + + struct bch_fs *c = bch2_fs_open(argv, argc, opts); + if (IS_ERR(c)) + die("error opening %s: %s", argv[0], strerror(-PTR_ERR(c))); down_read(&c->gc_lock); @@ -156,67 +155,72 @@ int cmd_dump(int argc, char *argv[]) static void list_keys(struct bch_fs *c, enum btree_id btree_id, struct bpos start, struct bpos end) { - struct btree_iter iter; + struct btree_trans trans; + 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(&iter, c, btree_id, start, - BTREE_ITER_PREFETCH, k) { + for_each_btree_key(&trans, iter, btree_id, start, + BTREE_ITER_PREFETCH, k, ret) { if (bkey_cmp(k.k->p, end) > 0) break; - bch2_bkey_val_to_text(c, bkey_type(0, btree_id), - buf, sizeof(buf), k); + bch2_bkey_val_to_text(&PBUF(buf), c, k); puts(buf); } - bch2_btree_iter_unlock(&iter); + bch2_trans_exit(&trans); } static void list_btree_formats(struct bch_fs *c, enum btree_id btree_id, struct bpos start, struct bpos end) { - struct btree_iter iter; + struct btree_trans trans; + struct btree_iter *iter; struct btree *b; char buf[4096]; - for_each_btree_node(&iter, c, btree_id, start, 0, b) { + bch2_trans_init(&trans, c, 0, 0); + + for_each_btree_node(&trans, iter, btree_id, start, 0, b) { if (bkey_cmp(b->key.k.p, end) > 0) break; - bch2_print_btree_node(c, b, buf, sizeof(buf)); + bch2_btree_node_to_text(&PBUF(buf), c, b); puts(buf); } - bch2_btree_iter_unlock(&iter); + bch2_trans_exit(&trans); } static void list_nodes_keys(struct bch_fs *c, enum btree_id btree_id, struct bpos start, struct bpos end) { - struct btree_iter iter; + struct btree_trans trans; + struct btree_iter *iter; struct btree_node_iter node_iter; struct bkey unpacked; struct bkey_s_c k; struct btree *b; char buf[4096]; - for_each_btree_node(&iter, c, btree_id, start, 0, b) { + bch2_trans_init(&trans, c, 0, 0); + + for_each_btree_node(&trans, iter, btree_id, start, 0, b) { if (bkey_cmp(b->key.k.p, end) > 0) break; - bch2_print_btree_node(c, b, buf, sizeof(buf)); + bch2_btree_node_to_text(&PBUF(buf), c, b); fputs(buf, stdout); - buf[0] = '\t'; - - for_each_btree_node_key_unpack(b, k, &node_iter, - btree_node_is_extents(b), - &unpacked) { - bch2_bkey_val_to_text(c, bkey_type(0, btree_id), - buf + 1, sizeof(buf) - 1, k); + for_each_btree_node_key_unpack(b, k, &node_iter, &unpacked) { + bch2_bkey_val_to_text(&PBUF(buf), c, k); + putchar('\t'); puts(buf); } } - bch2_btree_iter_unlock(&iter); + bch2_trans_exit(&trans); } static struct bpos parse_pos(char *buf) @@ -240,8 +244,8 @@ static struct bpos parse_pos(char *buf) static void list_keys_usage(void) { - puts("bcachefs list_keys - list filesystem metadata to stdout\n" - "Usage: bcachefs list_keys [OPTION]... \n" + puts("bcachefs list - list filesystem metadata to stdout\n" + "Usage: bcachefs list [OPTION]... \n" "\n" "Options:\n" " -b (extents|inodes|dirents|xattrs) Btree to list from\n" @@ -249,6 +253,8 @@ static void list_keys_usage(void) " -e inode:offset End position\n" " -i inode List keys for a given inode number\n" " -m (keys|formats) List mode\n" + " -f Check (fsck) the filesystem first\n" + " -v Verbose mode\n" " -h Display this help and exit\n" "Report bugs to "); } @@ -263,16 +269,15 @@ static const char * const list_modes[] = { int cmd_list(int argc, char *argv[]) { struct bch_opts opts = bch2_opts_empty(); - struct bch_fs *c = NULL; enum btree_id btree_id = BTREE_ID_EXTENTS; struct bpos start = POS_MIN, end = POS_MAX; - const char *err; u64 inum; int mode = 0, opt; - opts.nochanges = true; - opts.norecovery = true; - opts.errors = BCH_ON_ERROR_CONTINUE; + opt_set(opts, nochanges, true); + opt_set(opts, norecovery, 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) switch (opt) { @@ -297,23 +302,24 @@ int cmd_list(int argc, char *argv[]) list_modes, "list mode"); break; case 'f': - opts.fix_errors = FSCK_ERR_YES; - opts.norecovery = false; + opt_set(opts, fix_errors, FSCK_OPT_YES); + opt_set(opts, norecovery, false); break; case 'v': - opts.verbose_recovery = true; + opt_set(opts, verbose, true); break; case 'h': list_keys_usage(); exit(EXIT_SUCCESS); } + args_shift(optind); - if (optind >= argc) - die("Please supply device(s) to check"); + if (!argc) + die("Please supply device(s)"); - err = bch2_fs_open(argv + optind, argc - optind, opts, &c); - if (err) - die("error opening %s: %s", argv[optind], err); + struct bch_fs *c = bch2_fs_open(argv, argc, opts); + if (IS_ERR(c)) + die("error opening %s: %s", argv[0], strerror(-PTR_ERR(c))); switch (mode) { case 0: