bcachefs: Fix iterating of journal keys within a btree node

Extent btrees no longer have weird special behaviour for min_key.

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

diff --git a/fs/bcachefs/recovery.c b/fs/bcachefs/recovery.c
index c0e6cfa36c89a7c54c4a7351f5ca72c4903757c6..8e9d412a6000ce0d1b20202d40a7470d36a4d6f9 100644 (file)
--- a/fs/bcachefs/recovery.c
+++ b/fs/bcachefs/recovery.c
@@ -183,17 +183,12 @@ void bch2_btree_and_journal_iter_init_node_iter(struct btree_and_journal_iter *i
                                                struct journal_keys *journal_keys,
                                                struct btree *b)
 {
-       struct bpos start = b->data->min_key;
-
-       if (btree_node_type_is_extents(b->c.btree_id))
-               start = bkey_successor(start);
-
        memset(iter, 0, sizeof(*iter));
 
        iter->b = b;
        bch2_btree_node_iter_init_from_start(&iter->node_iter, iter->b);
        bch2_journal_iter_init(&iter->journal, journal_keys,
-                              b->c.btree_id, b->c.level, start);
+                              b->c.btree_id, b->c.level, b->data->min_key);
 }
 
 /* sort and dedup all keys in the journal: */