From: Kent Overstreet <kent.overstreet@linux.dev>
Date: Tue, 17 Jun 2025 20:41:43 +0000 (-0400)
Subject: bcachefs: fsck: fix unhandled restart in topology repair
X-Git-Tag: v6.16-rc4~24^2~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3f890768dab1f97ff9bd7ebb76f4c52309401501;p=thirdparty%2Flinux.git

bcachefs: fsck: fix unhandled restart in topology repair

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

diff --git a/fs/bcachefs/btree_gc.c b/fs/bcachefs/btree_gc.c
index e92cf3928c634..697c6ecc3a655 100644
--- a/fs/bcachefs/btree_gc.c
+++ b/fs/bcachefs/btree_gc.c
@@ -503,8 +503,14 @@ again:
 	prt_newline(&buf);
 	bch2_bkey_val_to_text(&buf, c, bkey_i_to_s_c(&b->key));
 
+	/*
+	 * XXX: we're not passing the trans object here because we're not set up
+	 * to handle a transaction restart - this code needs to be rewritten
+	 * when we start doing online topology repair
+	 */
+	bch2_trans_unlock_long(trans);
 	if (mustfix_fsck_err_on(!have_child,
-			trans, btree_node_topology_interior_node_empty,
+			c, btree_node_topology_interior_node_empty,
 			"empty interior btree node at %s", buf.buf))
 		ret = DROP_THIS_NODE;
 err: