summaryrefslogtreecommitdiffstats
path: root/fs/bcachefs/btree_journal_iter.h
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@linux.dev>2024-03-26 17:14:43 -0400
committerKent Overstreet <kent.overstreet@linux.dev>2024-03-31 20:36:11 -0400
commit40cb26233a060aeb936de7ea1f6ac2659ed9951c (patch)
tree1e7b1e302a02cf5a785b7e1b26d217bde38e2215 /fs/bcachefs/btree_journal_iter.h
parent048f47e83fc315499dc1943176b3ebe1a55574fb (diff)
downloadlinux-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.h')
-rw-r--r--fs/bcachefs/btree_journal_iter.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/bcachefs/btree_journal_iter.h b/fs/bcachefs/btree_journal_iter.h
index c9d19da3ea04..09cd53091a05 100644
--- a/fs/bcachefs/btree_journal_iter.h
+++ b/fs/bcachefs/btree_journal_iter.h
@@ -40,8 +40,8 @@ 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);
+bool bch2_key_deleted_in_journal(struct btree_trans *, 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 *);