summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@gmail.com>2019-07-16 12:23:04 -0400
committerKent Overstreet <kent.overstreet@linux.dev>2023-10-22 17:08:24 -0400
commita4461c8a7fc33aa663b0b1b2b7144d5890b6887f (patch)
tree51403232c8b432af3644e7ff4244ed3ae14eb1e9
parent0c04f5eb0d49c92e5223dd98bb8e2577b9ce6f49 (diff)
bcachefs: Print out name of bkey type
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
-rw-r--r--fs/bcachefs/bkey_methods.c7
-rw-r--r--fs/bcachefs/bkey_methods.h2
2 files changed, 4 insertions, 5 deletions
diff --git a/fs/bcachefs/bkey_methods.c b/fs/bcachefs/bkey_methods.c
index 27f196ef0b18..8af16ca994e0 100644
--- 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 08b976633360..e6e97cda4f50 100644
--- 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,