mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-15 00:04:15 +08:00
5222a4607c
This adds a new btree iterator flag, BTREE_ITER_WITH_JOURNAL, that is automatically enabled when initializing a btree iterator before journal replay has completed - it overlays the contents of the journal with the btree. This lets us delete bch2_btree_and_journal_walk() and just use the normal btree iterator interface instead - which also lets us delete a significant amount of duplicated code. Note that BTREE_ITER_WITH_JOURNAL is still unoptimized in this patch - we're redoing the binary search over keys in the journal every time we call bch2_btree_iter_peek(). Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
65 lines
1.9 KiB
C
65 lines
1.9 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef _BCACHEFS_RECOVERY_H
|
|
#define _BCACHEFS_RECOVERY_H
|
|
|
|
#define for_each_journal_key(keys, i) \
|
|
for (i = (keys).d; i < (keys).d + (keys).nr; (i)++)
|
|
|
|
struct journal_iter {
|
|
struct list_head list;
|
|
enum btree_id btree_id;
|
|
unsigned level;
|
|
size_t idx;
|
|
struct journal_keys *keys;
|
|
};
|
|
|
|
/*
|
|
* Iterate over keys in the btree, with keys from the journal overlaid on top:
|
|
*/
|
|
|
|
struct btree_and_journal_iter {
|
|
struct btree *b;
|
|
struct btree_node_iter node_iter;
|
|
struct bkey unpacked;
|
|
|
|
struct journal_iter journal;
|
|
|
|
enum last_key_returned {
|
|
none,
|
|
btree,
|
|
journal,
|
|
} last;
|
|
};
|
|
|
|
size_t bch2_journal_key_search(struct journal_keys *, enum btree_id,
|
|
unsigned, struct bpos);
|
|
|
|
int bch2_journal_key_insert_take(struct bch_fs *, enum btree_id,
|
|
unsigned, struct bkey_i *);
|
|
int bch2_journal_key_insert(struct bch_fs *, enum btree_id,
|
|
unsigned, struct bkey_i *);
|
|
int bch2_journal_key_delete(struct bch_fs *, enum btree_id,
|
|
unsigned, struct bpos);
|
|
void bch2_journal_key_overwritten(struct bch_fs *, enum btree_id,
|
|
unsigned, struct bpos);
|
|
|
|
void bch2_btree_and_journal_iter_advance(struct btree_and_journal_iter *);
|
|
struct bkey_s_c bch2_btree_and_journal_iter_peek(struct btree_and_journal_iter *);
|
|
struct bkey_s_c bch2_btree_and_journal_iter_next(struct btree_and_journal_iter *);
|
|
|
|
void bch2_btree_and_journal_iter_exit(struct btree_and_journal_iter *);
|
|
void __bch2_btree_and_journal_iter_init_node_iter(struct btree_and_journal_iter *,
|
|
struct bch_fs *, struct btree *,
|
|
struct btree_node_iter, struct bpos);
|
|
void bch2_btree_and_journal_iter_init_node_iter(struct btree_and_journal_iter *,
|
|
struct bch_fs *,
|
|
struct btree *);
|
|
|
|
void bch2_journal_keys_free(struct journal_keys *);
|
|
void bch2_journal_entries_free(struct list_head *);
|
|
|
|
int bch2_fs_recovery(struct bch_fs *);
|
|
int bch2_fs_initialize(struct bch_fs *);
|
|
|
|
#endif /* _BCACHEFS_RECOVERY_H */
|