From b58a181d5c4a145730f202ac0375fa463c88f710 Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Mon, 30 Mar 2020 18:11:13 -0400 Subject: [PATCH] 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 Signed-off-by: Kent Overstreet --- fs/bcachefs/recovery.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/fs/bcachefs/recovery.c b/fs/bcachefs/recovery.c index c0e6cfa36c89a..8e9d412a6000c 100644 --- 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: */ -- 2.30.2