bcachefs: Fix check_topology() when using node scan

Kent Overstreet · Kent Overstreet · commit 359571c327a7 · 2024-04-09T00:04:57.000-04:00
shoot down journal keys _before_ populating journal keys with pointers
to scanned nodes

Signed-off-by: Kent Overstreet &lt;kent.overstreet@linux.dev&gt;
diff --git a/fs/bcachefs/btree_gc.c b/fs/bcachefs/btree_gc.c
@@ -544,12 +544,12 @@ int bch2_check_topology(struct bch_fs *c)
 				bch2_btree_root_alloc_fake(c, i, 0);
 			} else {
 				bch2_btree_root_alloc_fake(c, i, 1);
+				bch2_shoot_down_journal_keys(c, i, 1, BTREE_MAX_DEPTH, POS_MIN, SPOS_MAX);
 				ret = bch2_get_scanned_nodes(c, i, 0, POS_MIN, SPOS_MAX);
 				if (ret)
 					break;
 			}
 
-			bch2_shoot_down_journal_keys(c, i, 1, BTREE_MAX_DEPTH, POS_MIN, SPOS_MAX);
 			reconstructed_root = true;
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -544,12 +544,12 @@ int bch2_check_topology(struct bch_fs *c)`
`544`	`544`	`bch2_btree_root_alloc_fake(c, i, 0);`
`545`	`545`	`} else {`
`546`	`546`	`bch2_btree_root_alloc_fake(c, i, 1);`
	`547`	`+ bch2_shoot_down_journal_keys(c, i, 1, BTREE_MAX_DEPTH, POS_MIN, SPOS_MAX);`
`547`	`548`	`ret = bch2_get_scanned_nodes(c, i, 0, POS_MIN, SPOS_MAX);`
`548`	`549`	`if (ret)`
`549`	`550`	`break;`
`550`	`551`	`}`
`551`	`552`
`552`		`- bch2_shoot_down_journal_keys(c, i, 1, BTREE_MAX_DEPTH, POS_MIN, SPOS_MAX);`
`553`	`553`	`reconstructed_root = true;`
`554`	`554`	`}`
`555`	`555`