bcachefs: Print out name of bkey type

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

diff --git a/fs/bcachefs/bkey_methods.c b/fs/bcachefs/bkey_methods.c
index 27f196ef0b186963df59c6523479db6593e11eee..8af16ca994e08619cc199cef0c08c27ee71aa7ea 100644 (file)
--- a/fs/bcachefs/bkey_methods.c
+++ b/fs/bcachefs/bkey_methods.c
@@ -12,7 +12,7 @@
 #include "quota.h"
 #include "xattr.h"
 
-const char * const bch_bkey_types[] = {
+const char * const bch2_bkey_types[] = {
 #define x(name, nr) #name,
        BCH_BKEY_TYPES()
 #undef x
@@ -159,7 +159,8 @@ void bch2_bpos_to_text(struct printbuf *out, struct bpos pos)
 
 void bch2_bkey_to_text(struct printbuf *out, const struct bkey *k)
 {
-       pr_buf(out, "u64s %u type %u ", k->u64s, k->type);
+       pr_buf(out, "u64s %u type %s ", k->u64s,
+              bch2_bkey_types[k->type]);
 
        bch2_bpos_to_text(out, k->p);
 
@@ -174,8 +175,6 @@ void bch2_val_to_text(struct printbuf *out, struct bch_fs *c,
 
        if (likely(ops->val_to_text))
                ops->val_to_text(out, c, k);
-       else
-               pr_buf(out, " %s", bch_bkey_types[k.k->type]);
 }
 
 void bch2_bkey_val_to_text(struct printbuf *out, struct bch_fs *c,

diff --git a/fs/bcachefs/bkey_methods.h b/fs/bcachefs/bkey_methods.h
index 08b976633360583176961ef2e118a210d2b4cd24..e6e97cda4f501154c69fe09654a830391bf9a48b 100644 (file)
--- a/fs/bcachefs/bkey_methods.h
+++ b/fs/bcachefs/bkey_methods.h
@@ -9,7 +9,7 @@ struct btree;
 struct bkey;
 enum btree_node_type;
 
-extern const char * const bch_bkey_types[];
+extern const char * const bch2_bkey_types[];
 
 enum merge_result {
        BCH_MERGE_NOMERGE,