From 39f27a145b150b997d57d97e572eb3ad9ab4e75c Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Sat, 13 Jul 2024 00:42:01 -0400 Subject: [PATCH] Update bcachefs sources to e9a4628edd fixup! bcachefs: btree node scan: fall back to comparing by journal seq --- libbcachefs/btree_node_scan.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/libbcachefs/btree_node_scan.c b/libbcachefs/btree_node_scan.c index 3d634134..3fab41b8 100644 --- a/libbcachefs/btree_node_scan.c +++ b/libbcachefs/btree_node_scan.c @@ -336,6 +336,28 @@ again: found_btree_node_to_text(&buf, c, n); bch_err(c, "%s", buf.buf); printbuf_exit(&buf); + + struct { __BKEY_PADDED(k, BKEY_BTREE_PTR_VAL_U64s_MAX); } tmp; + struct btree *b; + + struct btree_trans *trans = bch2_trans_get(c); + + found_btree_node_to_key(&tmp.k, start); + b = bch2_btree_node_get_noiter(trans, &tmp.k, + start->btree_id, start->level, false); + if (!IS_ERR_OR_NULL(b)) { + bch2_dump_btree_node(c, b); + six_unlock_read(&b->c.lock); + } + + found_btree_node_to_key(&tmp.k, n); + b = bch2_btree_node_get_noiter(trans, &tmp.k, + start->btree_id, start->level, false); + if (!IS_ERR_OR_NULL(b)) { + bch2_dump_btree_node(c, b); + six_unlock_read(&b->c.lock); + } + bch2_trans_put(trans); return -BCH_ERR_fsck_repair_unimplemented; } }