Update bcachefs sources to 14ce2a2031 bcachefs: fixes for building in userspace

[bcachefs-tools-debian] / cmd_debug.c

diff --git a/cmd_debug.c b/cmd_debug.c
index ef4fa8481904f08e337c1c719c8f8e7968dc4f90..1a2c1dbd195c83b699d1cbcb6b81435ae2b83beb 100644 (file)
--- a/cmd_debug.c
+++ b/cmd_debug.c
@@ -8,13 +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 "journal.h"
-#include "super.h"
+#include "libbcachefs/bcachefs.h"
+#include "libbcachefs/alloc.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)
 {
@@ -54,12 +55,6 @@ 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;
@@ -93,9 +88,10 @@ int cmd_dump(int argc, char *argv[])
        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, noreplay,         true);
+       opt_set(opts, degraded,         true);
+       opt_set(opts, errors,           BCH_ON_ERROR_CONTINUE);
 
        while ((opt = getopt(argc, argv, "o:fh")) != -1)
                switch (opt) {
@@ -128,10 +124,10 @@ int cmd_dump(int argc, char *argv[])
        BUG_ON(!nr_devices);
 
        for_each_online_member(ca, c, i) {
-               int mode = O_WRONLY|O_CREAT|O_TRUNC;
+               int flags = O_WRONLY|O_CREAT|O_TRUNC;
 
                if (!force)
-                       mode |= O_EXCL;
+                       flags |= O_EXCL;
 
                if (!c->devs[i])
                        continue;
@@ -139,7 +135,7 @@ int cmd_dump(int argc, char *argv[])
                char *path = nr_devices > 1
                        ? mprintf("%s.%u", out, i)
                        : strdup(out);
-               fd = xopen(path, mode, 0600);
+               fd = xopen(path, flags, 0600);
                free(path);
 
                dump_one_device(c, ca, fd);
@@ -153,13 +149,14 @@ 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, int mode)
+                     struct bpos start, struct bpos end)
 {
        struct btree_iter iter;
        struct bkey_s_c k;
        char buf[512];
 
-       for_each_btree_key(&iter, c, btree_id, start, k) {
+       for_each_btree_key(&iter, c, btree_id, start,
+                          BTREE_ITER_PREFETCH, k) {
                if (bkey_cmp(k.k->p, end) > 0)
                        break;
 
@@ -171,7 +168,7 @@ static void list_keys(struct bch_fs *c, enum btree_id btree_id,
 }
 
 static void list_btree_formats(struct bch_fs *c, enum btree_id btree_id,
-                              struct bpos start, struct bpos end, int mode)
+                              struct bpos start, struct bpos end)
 {
        struct btree_iter iter;
        struct btree *b;
@@ -187,6 +184,36 @@ static void list_btree_formats(struct bch_fs *c, enum btree_id btree_id,
        bch2_btree_iter_unlock(&iter);
 }
 
+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_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) {
+               if (bkey_cmp(b->key.k.p, end) > 0)
+                       break;
+
+               bch2_print_btree_node(c, b, buf, sizeof(buf));
+               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);
+                       puts(buf);
+               }
+       }
+       bch2_btree_iter_unlock(&iter);
+}
+
 static struct bpos parse_pos(char *buf)
 {
        char *s = buf, *field;
@@ -224,6 +251,7 @@ static void list_keys_usage(void)
 static const char * const list_modes[] = {
        "keys",
        "formats",
+       "nodes",
        NULL
 };
 
@@ -237,11 +265,12 @@ int cmd_list(int argc, char *argv[])
        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:h")) != -1)
+       while ((opt = getopt(argc, argv, "b:s:e:i:m:fvh")) != -1)
                switch (opt) {
                case 'b':
                        btree_id = read_string_list_or_die(optarg,
@@ -263,6 +292,13 @@ int cmd_list(int argc, char *argv[])
                        mode = read_string_list_or_die(optarg,
                                                list_modes, "list mode");
                        break;
+               case 'f':
+                       opt_set(opts, fix_errors, FSCK_OPT_YES);
+                       opt_set(opts, norecovery, false);
+                       break;
+               case 'v':
+                       opt_set(opts, verbose_recovery, true);
+                       break;
                case 'h':
                        list_keys_usage();
                        exit(EXIT_SUCCESS);
@@ -277,10 +313,13 @@ int cmd_list(int argc, char *argv[])
 
        switch (mode) {
        case 0:
-               list_keys(c, btree_id, start, end, mode);
+               list_keys(c, btree_id, start, end);
                break;
        case 1:
-               list_btree_formats(c, btree_id, start, end, mode);
+               list_btree_formats(c, btree_id, start, end);
+               break;
+       case 2:
+               list_nodes_keys(c, btree_id, start, end);
                break;
        default:
                die("Invalid mode");