From 8b31dfb3500fc642ccd36f0aaa0c3ab1b54abb1c Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Fri, 6 Dec 2024 20:48:25 -0500 Subject: Update bcachefs sources to 55a65a994ed5 bcachefs: bcachefs_metadata_version_persistent_inode_cursors Signed-off-by: Kent Overstreet --- libbcachefs/error.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'libbcachefs/error.c') diff --git a/libbcachefs/error.c b/libbcachefs/error.c index 7af5c594..038da6a6 100644 --- a/libbcachefs/error.c +++ b/libbcachefs/error.c @@ -477,8 +477,8 @@ int __bch2_bkey_fsck_err(struct bch_fs *c, unsigned fsck_flags = 0; if (!(from.flags & (BCH_VALIDATE_write|BCH_VALIDATE_commit))) { - //if (test_bit(err, c->sb.errors_silent)) - // return -BCH_ERR_fsck_delete_bkey; + if (test_bit(err, c->sb.errors_silent)) + return -BCH_ERR_fsck_delete_bkey; fsck_flags |= FSCK_AUTOFIX|FSCK_CAN_FIX; } @@ -486,9 +486,14 @@ int __bch2_bkey_fsck_err(struct bch_fs *c, fsck_flags |= fsck_flags_extra[err]; struct printbuf buf = PRINTBUF; - - prt_printf(&buf, "invalid bkey in %s btree=", + prt_printf(&buf, "invalid bkey in %s", bch2_bkey_validate_contexts[from.from]); + + if (from.from == BKEY_VALIDATE_journal) + prt_printf(&buf, " journal seq=%llu offset=%u", + from.journal_seq, from.journal_offset); + + prt_str(&buf, " btree="); bch2_btree_id_to_text(&buf, from.btree); prt_printf(&buf, " level=%u: ", from.level); -- cgit v1.2.3