From 7efaf45d782f463442eabee89da679b231e2e650 Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Mon, 27 May 2024 19:17:49 -0400 Subject: [PATCH] Update bcachefs sources to bc0fa834a738 bcachefs: Better fsck error message for key version --- .bcachefs_revision | 2 +- libbcachefs/btree_gc.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.bcachefs_revision b/.bcachefs_revision index 462c88de..94d3fd96 100644 --- a/.bcachefs_revision +++ b/.bcachefs_revision @@ -1 +1 @@ -ea473c4a1a2133e6afaad76cd65fb9155c945d45 +bc0fa834a738d6fa03c548f26f05dc031ed19e74 diff --git a/libbcachefs/btree_gc.c b/libbcachefs/btree_gc.c index e9e901fe..dc97991b 100644 --- a/libbcachefs/btree_gc.c +++ b/libbcachefs/btree_gc.c @@ -585,16 +585,17 @@ static int bch2_gc_mark_key(struct btree_trans *trans, enum btree_id btree_id, if (fsck_err_on(k.k->version.lo > atomic64_read(&c->key_version), c, bkey_version_in_future, - "key version number higher than recorded: %llu > %llu", - k.k->version.lo, - atomic64_read(&c->key_version))) + "key version number higher than recorded %llu\n %s", + atomic64_read(&c->key_version), + (bch2_bkey_val_to_text(&buf, c, k), buf.buf))) atomic64_set(&c->key_version, k.k->version.lo); } if (mustfix_fsck_err_on(level && !bch2_dev_btree_bitmap_marked(c, k), c, btree_bitmap_not_marked, "btree ptr not marked in member info btree allocated bitmap\n %s", - (bch2_bkey_val_to_text(&buf, c, k), + (printbuf_reset(&buf), + bch2_bkey_val_to_text(&buf, c, k), buf.buf))) { mutex_lock(&c->sb_lock); bch2_dev_btree_bitmap_mark(c, k);