diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2020-03-30 18:11:13 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2020-03-30 18:14:48 -0400 |
| commit | fa5ddfca312dc9e4dd406df0cf4c26c4e8c12136 (patch) | |
| tree | 98c40090d36be32b9f69c8d55fbf56c0e7589559 | |
| parent | a897b0f199b2fb888f5885f115306759199094dd (diff) | |
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>
| -rw-r--r-- | fs/bcachefs/recovery.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/fs/bcachefs/recovery.c b/fs/bcachefs/recovery.c index 8cfae639e23f..a4d0eec2ea3e 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->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->btree_id, b->level, start); + b->btree_id, b->level, b->data->min_key); } /* sort and dedup all keys in the journal: */ |