bcachefs: Fix assertion in topology repair
authorKent Overstreet <kent.overstreet@gmail.com>
Thu, 23 Jun 2022 01:33:43 +0000 (21:33 -0400)
committerKent Overstreet <kent.overstreet@linux.dev>
Sun, 22 Oct 2023 21:09:34 +0000 (17:09 -0400)
If we were at the end of the node, when breaking out of the loop we'd
pop the assertion on line 446 when cur wasn't NULL.

Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
fs/bcachefs/btree_gc.c

index 123644ffe93c3421ab50b3efb933711dbd755955..2de5d97a9d2c6d6ecea9f180552e483addd91630 100644 (file)
@@ -395,6 +395,7 @@ again:
                        bch2_btree_node_evict(c, cur_k.k);
                        ret = bch2_journal_key_delete(c, b->c.btree_id,
                                                      b->c.level, cur_k.k->k.p);
+                       cur = NULL;
                        if (ret)
                                break;
                        continue;
@@ -413,6 +414,7 @@ again:
                        bch2_btree_node_evict(c, cur_k.k);
                        ret = bch2_journal_key_delete(c, b->c.btree_id,
                                                      b->c.level, cur_k.k->k.p);
+                       cur = NULL;
                        if (ret)
                                break;
                        continue;