summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@linux.dev>2025-06-17 16:45:37 -0400
committerKent Overstreet <kent.overstreet@linux.dev>2025-06-17 16:45:37 -0400
commit35c7f2b4e369fec62633de667339496c3e4544c8 (patch)
treed6e52510bbbe38373aef9dc56a7dbb100d402a64
parent1cdc1c3aee8ac4bc26d8380615ad069c955ba945 (diff)
Update bcachefs sources to 4af8a1ac90dc bcachefs: fsck: fix unhandled restart in topology repair
-rw-r--r--.bcachefs_revision2
-rw-r--r--libbcachefs/btree_gc.c7
2 files changed, 7 insertions, 2 deletions
diff --git a/.bcachefs_revision b/.bcachefs_revision
index ba02a581..1509bf37 100644
--- a/.bcachefs_revision
+++ b/.bcachefs_revision
@@ -1 +1 @@
-bbc3a0b17a890aa19bddd0f9b08e8af488f1ec94
+4af8a1ac90dcd9028d5a53b4487aa0d3a47f3de4
diff --git a/libbcachefs/btree_gc.c b/libbcachefs/btree_gc.c
index e92cf392..448f2a4a 100644
--- a/libbcachefs/btree_gc.c
+++ b/libbcachefs/btree_gc.c
@@ -503,8 +503,13 @@ 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
+ */
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: