diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2024-03-26 17:14:43 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2024-03-31 20:36:11 -0400 |
| commit | 40cb26233a060aeb936de7ea1f6ac2659ed9951c (patch) | |
| tree | 1e7b1e302a02cf5a785b7e1b26d217bde38e2215 /fs/bcachefs/btree_journal_iter.c | |
| parent | 048f47e83fc315499dc1943176b3ebe1a55574fb (diff) | |
| download | linux-40cb26233a060aeb936de7ea1f6ac2659ed9951c.tar.gz linux-40cb26233a060aeb936de7ea1f6ac2659ed9951c.tar.bz2 linux-40cb26233a060aeb936de7ea1f6ac2659ed9951c.zip | |
bcachefs: Be careful about btree node splits during journal replay
Don't pick a pivot that's going to be deleted.
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs/bcachefs/btree_journal_iter.c')
| -rw-r--r-- | fs/bcachefs/btree_journal_iter.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/fs/bcachefs/btree_journal_iter.c b/fs/bcachefs/btree_journal_iter.c index 0272ef0d7310..1f588264575d 100644 --- a/fs/bcachefs/btree_journal_iter.c +++ b/fs/bcachefs/btree_journal_iter.c @@ -261,6 +261,22 @@ int bch2_journal_key_delete(struct bch_fs *c, enum btree_id id, return bch2_journal_key_insert(c, id, level, &whiteout); } +bool bch2_key_deleted_in_journal(struct btree_trans *trans, enum btree_id btree, + unsigned level, struct bpos pos) +{ + struct journal_keys *keys = &trans->c->journal_keys; + size_t idx = bch2_journal_key_search(keys, btree, level, pos); + + if (!trans->journal_replay_not_finished) + return false; + + return (idx < keys->size && + keys->data[idx].btree_id == btree && + keys->data[idx].level == level && + bpos_eq(keys->data[idx].k->k.p, pos) && + bkey_deleted(&keys->data[idx].k->k)); +} + void bch2_journal_key_overwritten(struct bch_fs *c, enum btree_id btree, unsigned level, struct bpos pos) { |