From: Kent Overstreet <kent.overstreet@gmail.com>
Date: Tue, 16 Jul 2019 16:23:04 +0000 (-0400)
Subject: bcachefs: Print out name of bkey type
X-Git-Tag: v6.7-rc1~201^2~2408
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4461c8a7fc33aa663b0b1b2b7144d5890b6887f;p=thirdparty%2Flinux.git

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 27f196ef0b186..8af16ca994e08 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 08b9766333605..e6e97cda4f501 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,