]> git.sesse.net Git - bcachefs-tools-debian/blobdiff - cmd_debug.c
projects / bcachefs-tools-debian / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
cmd_list improvements
[bcachefs-tools-debian] / cmd_debug.c
diff --git a/cmd_debug.c b/cmd_debug.c
index c4dd24ba1de8ec74c66530f5c5bf09bcad44b453..9981adbf15cdfe48eca1be2d2c108f03bcdc8918 100644 (file)
--- a/cmd_debug.c
+++ b/cmd_debug.c
@@ -114,7 +114,7 @@ int cmd_dump(int argc, char *argv[])
        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, errors,           BCH_ON_ERROR_continue);
        opt_set(opts, fix_errors,       FSCK_OPT_YES);
 
        while ((opt = getopt(argc, argv, "o:fvh")) != -1)
@@ -195,10 +195,12 @@ static void list_keys(struct bch_fs *c, enum btree_id btree_id,
                bch2_bkey_val_to_text(&PBUF(buf), c, k);
                puts(buf);
        }
+       bch2_trans_iter_put(&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;
@@ -208,18 +210,20 @@ static void list_btree_formats(struct bch_fs *c, enum btree_id btree_id,
 
        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) {
                if (bkey_cmp(b->key.k.p, end) > 0)
                        break;
 
                bch2_btree_node_to_text(&PBUF(buf), c, b);
                puts(buf);
        }
+       bch2_trans_iter_put(&trans, iter);
+
        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;
@@ -228,7 +232,7 @@ static void list_nodes(struct bch_fs *c, enum btree_id btree_id,
 
        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) {
                if (bkey_cmp(b->key.k.p, end) > 0)
                        break;
 
@@ -236,6 +240,8 @@ static void list_nodes(struct bch_fs *c, enum btree_id btree_id,
                fputs(buf, stdout);
                putchar('\n');
        }
+       bch2_trans_iter_put(&trans, iter);
+
        bch2_trans_exit(&trans);
 }
 
@@ -323,9 +329,7 @@ static void print_node_ondisk(struct bch_fs *c, struct btree *b)
                        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];
 
@@ -337,7 +341,7 @@ static void print_node_ondisk(struct bch_fs *c, struct btree *b)
        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;
@@ -347,7 +351,7 @@ static void list_nodes_ondisk(struct bch_fs *c, enum btree_id btree_id,
 
        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) {
                if (bkey_cmp(b->key.k.p, end) > 0)
                        break;
 
@@ -357,10 +361,12 @@ static void list_nodes_ondisk(struct bch_fs *c, enum btree_id btree_id,
 
                print_node_ondisk(c, b);
        }
+       bch2_trans_iter_put(&trans, iter);
+
        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;
@@ -373,7 +379,7 @@ static void list_nodes_keys(struct bch_fs *c, enum btree_id btree_id,
 
        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) {
                if (bkey_cmp(b->key.k.p, end) > 0)
                        break;
 
@@ -386,26 +392,9 @@ static void list_nodes_keys(struct bch_fs *c, enum btree_id btree_id,
                        puts(buf);
                }
        }
-       bch2_trans_exit(&trans);
-}
-
-static struct bpos parse_pos(char *buf)
-{
-       char *s = buf, *field;
-       u64 inode_v = 0, offset_v = 0;
-
-       if (!(field = strsep(&s, ":")) ||
-           kstrtoull(field, 10, &inode_v))
-               die("invalid bpos %s", buf);
-
-       if ((field = strsep(&s, ":")) &&
-           kstrtoull(field, 10, &offset_v))
-               die("invalid bpos %s", buf);
-
-       if (s)
-               die("invalid bpos %s", buf);
+       bch2_trans_iter_put(&trans, iter);
 
-       return (struct bpos) { .inode = inode_v, .offset = offset_v };
+       bch2_trans_exit(&trans);
 }
 
 static void list_keys_usage(void)
@@ -415,22 +404,35 @@ static void list_keys_usage(void)
             "\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
 };
 
@@ -440,6 +442,7 @@ int cmd_list(int argc, char *argv[])
        enum btree_id btree_id_start    = 0;
        enum btree_id btree_id_end      = BTREE_ID_NR;
        enum btree_id btree_id;
+       unsigned level;
        struct bpos start = POS_MIN, end = POS_MAX;
        u64 inum;
        int mode = 0, opt;
@@ -447,20 +450,24 @@ int cmd_list(int argc, char *argv[])
        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, 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   = parse_pos(optarg);
+                       start   = bpos_parse(optarg);
                        break;
                case 'e':
-                       end     = parse_pos(optarg);
+                       end     = bpos_parse(optarg);
                        break;
                case 'i':
                        if (kstrtoull(optarg, 10, &inum))
@@ -497,20 +504,20 @@ int cmd_list(int argc, char *argv[])
             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");
@@ -540,7 +547,7 @@ int cmd_list_journal(int argc, char *argv[])
        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, errors,           BCH_ON_ERROR_continue);
        opt_set(opts, fix_errors,       FSCK_OPT_YES);
        opt_set(opts, keep_journal,     true);
 
Unnamed repository; edit this file 'description' to name the repository.