diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2022-02-24 08:08:53 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-22 17:09:23 -0400 |
| commit | 45e4cd9e3a088d476929c5ee245e83baeee6cdd5 (patch) | |
| tree | 8ca589c1c5eb97cc437aeb508e1fb5447458ee07 /fs/bcachefs/recovery.c | |
| parent | 2e63e180665d527f52b2200acca4aeced065e63f (diff) | |
| download | lwn-45e4cd9e3a088d476929c5ee245e83baeee6cdd5.tar.gz lwn-45e4cd9e3a088d476929c5ee245e83baeee6cdd5.zip | |
bcachefs: run_one_trigger() now checks journal keys
Previously, when doing updates and running triggers before journal
replay completes, triggers would see the incorrect key for the old key
being overwritten - this patch updates the trigger code to check the
journal keys when necessary, needed for the upcoming allocator rewrite.
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
Diffstat (limited to 'fs/bcachefs/recovery.c')
| -rw-r--r-- | fs/bcachefs/recovery.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/fs/bcachefs/recovery.c b/fs/bcachefs/recovery.c index b818093eab39..383838d66edf 100644 --- a/fs/bcachefs/recovery.c +++ b/fs/bcachefs/recovery.c @@ -94,6 +94,24 @@ size_t bch2_journal_key_search(struct journal_keys *journal_keys, return l; } +struct bkey_i *bch2_journal_keys_peek(struct bch_fs *c, enum btree_id btree_id, + unsigned level, struct bpos pos) +{ + struct journal_keys *keys = &c->journal_keys; + struct journal_key *end = keys->d + keys->nr; + struct journal_key *k = keys->d + + bch2_journal_key_search(keys, btree_id, level, pos); + + while (k < end && k->overwritten) + k++; + + if (k < end && + k->btree_id == btree_id && + k->level == level) + return k->k; + return NULL; +} + static void journal_iter_fix(struct bch_fs *c, struct journal_iter *iter, unsigned idx) { struct bkey_i *n = iter->keys->d[idx].k; |