From: Kent Overstreet <kent.overstreet@linux.dev>
Date: Tue, 8 Jul 2025 19:21:39 +0000 (-0400)
Subject: bcachefs: Don't set BCH_FS_error on transaction restart
X-Git-Tag: v6.16-rc6~7^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fec5e6f97dae5fbd628c444148b77728eae3bb93;p=thirdparty%2Fkernel%2Flinux.git

bcachefs: Don't set BCH_FS_error on transaction restart

This started showing up more when we started logging the error being
corrected in the journal - but __bch2_fsck_err() could return
transaction restarts before that.

Setting BCH_FS_error incorrectly causes recovery passes to not be
cleared, among other issues.

Fixes: b43f72492768 ("bcachefs: Log fsck errors in the journal")
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
---

diff --git a/fs/bcachefs/error.c b/fs/bcachefs/error.c
index ea37f5af1800c..267e73d9d7e6e 100644
--- a/fs/bcachefs/error.c
+++ b/fs/bcachefs/error.c
@@ -633,7 +633,9 @@ err:
 	 * log_fsck_err()s: that would require us to track for every error type
 	 * which recovery pass corrects it, to get the fsck exit status correct:
 	 */
-	if (bch2_err_matches(ret, BCH_ERR_fsck_fix)) {
+	if (bch2_err_matches(ret, BCH_ERR_transaction_restart)) {
+		/* nothing */
+	} else if (bch2_err_matches(ret, BCH_ERR_fsck_fix)) {
 		set_bit(BCH_FS_errors_fixed, &c->flags);
 	} else {
 		set_bit(BCH_FS_errors_not_fixed, &c->flags);