From: Kent Overstreet <kent.overstreet@gmail.com>
Date: Thu, 23 Jun 2022 01:33:43 +0000 (-0400)
Subject: bcachefs: Fix assertion in topology repair
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2817d453819a10654ac72e5f4937d4653dea1648;p=linux.git

bcachefs: Fix assertion in topology repair

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>
---

diff --git a/fs/bcachefs/btree_gc.c b/fs/bcachefs/btree_gc.c
index 123644ffe93c3..2de5d97a9d2c6 100644
--- a/fs/bcachefs/btree_gc.c
+++ b/fs/bcachefs/btree_gc.c
@@ -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;