From: Kent Overstreet <kent.overstreet@linux.dev>
Date: Tue, 26 Sep 2023 05:39:25 +0000 (-0400)
Subject: bcachefs: Silence transaction restart error message
X-Git-Tag: v6.7-rc1~201^2~24
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a190cbcfa029b7921cfda484e2a125649496941e;p=thirdparty%2Flinux.git

bcachefs: Silence transaction restart error message

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
---

diff --git a/fs/bcachefs/fsck.c b/fs/bcachefs/fsck.c
index 206302b0f5ed8..2ef14adb4cb23 100644
--- a/fs/bcachefs/fsck.c
+++ b/fs/bcachefs/fsck.c
@@ -971,10 +971,10 @@ static int check_inode(struct btree_trans *trans,
 
 	if (do_update) {
 		ret = __write_inode(trans, &u, iter->pos.snapshot);
-		if (ret) {
+		if (ret && !bch2_err_matches(ret, BCH_ERR_transaction_restart))
 			bch_err_msg(c, ret, "in fsck updating inode");
+		if (ret)
 			return ret;
-		}
 	}
 err:
 fsck_err: