From c201e2d97615e7dc6f2f99dcdb8bf8d64657b761 Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Tue, 26 Nov 2019 17:18:23 -0500 Subject: [PATCH] bcachefs: Fix bch2_verify_insert_pos() We were calling __btree_node_key_to_offset() on a key that wasn't in the btree node. Signed-off-by: Kent Overstreet Signed-off-by: Kent Overstreet --- fs/bcachefs/bset.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/fs/bcachefs/bset.c b/fs/bcachefs/bset.c index 189a187bc080b..a0bd6af671900 100644 --- a/fs/bcachefs/bset.c +++ b/fs/bcachefs/bset.c @@ -241,10 +241,9 @@ void bch2_verify_insert_pos(struct btree *b, struct bkey_packed *where, bch2_bkey_to_text(&PBUF(buf2), &k2); panic("prev > insert:\n" - "prev key %5u %s\n" - "insert key %5u %s\n", - __btree_node_key_to_offset(b, prev), buf1, - __btree_node_key_to_offset(b, insert), buf2); + "prev key %s\n" + "insert key %s\n", + buf1, buf2); } #endif #if 0 @@ -263,10 +262,9 @@ void bch2_verify_insert_pos(struct btree *b, struct bkey_packed *where, bch2_bkey_to_text(&PBUF(buf2), &k2); panic("insert > next:\n" - "insert key %5u %s\n" - "next key %5u %s\n", - __btree_node_key_to_offset(b, insert), buf1, - __btree_node_key_to_offset(b, next), buf2); + "insert key %s\n" + "next key %s\n", + buf1, buf2); } #endif } -- 2.30.2