bcachefs: Fix btree_and_journal_iter

Browse source

We had a bug where btree_and_journal_iter would return the same key
twice - after deleting it (perhaps because it was present in both the
btree and the journal?)

This reworks btree_and_journal_iter to track the current position, much
like btree_paths, which makes the logic considerably simpler and more
robust.

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

...

This commit is contained in:

Kent Overstreet 2022-06-06 21:59:34 -04:00 • committed by Kent Overstreet

parent f2aa026575

commit 576179021c

2 changed files with 40 additions and 69 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

102

fs/bcachefs/recovery.c

View file

9

fs/bcachefs/recovery.h

View file