summaryrefslogtreecommitdiff
path: root/libbcachefs/btree_update_leaf.c
diff options
context:
space:
mode:
Diffstat (limited to 'libbcachefs/btree_update_leaf.c')
-rw-r--r--libbcachefs/btree_update_leaf.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/libbcachefs/btree_update_leaf.c b/libbcachefs/btree_update_leaf.c
index fccfc0b3..ef90f7a3 100644
--- a/libbcachefs/btree_update_leaf.c
+++ b/libbcachefs/btree_update_leaf.c
@@ -664,9 +664,10 @@ bch2_trans_commit_write_locked(struct btree_trans *trans,
if (unlikely(!test_bit(JOURNAL_REPLAY_DONE, &c->journal.flags))) {
struct bkey_i *j_k =
- bch2_journal_keys_peek(c, i->btree_id, i->level, i->k->k.p);
+ bch2_journal_keys_peek_slot(c, i->btree_id, i->level,
+ i->k->k.p);
- if (j_k && !bpos_cmp(j_k->k.p, i->k->k.p)) {
+ if (j_k) {
i->old_k = j_k->k;
i->old_v = &j_k->v;
}
@@ -1531,9 +1532,9 @@ bch2_trans_update_by_path(struct btree_trans *trans, struct btree_path *path,
if (unlikely(!test_bit(JOURNAL_REPLAY_DONE, &c->journal.flags))) {
struct bkey_i *j_k =
- bch2_journal_keys_peek(c, n.btree_id, n.level, k->k.p);
+ bch2_journal_keys_peek_slot(c, n.btree_id, n.level, k->k.p);
- if (j_k && !bpos_cmp(j_k->k.p, i->k->k.p)) {
+ if (j_k) {
i->old_k = j_k->k;
i->old_v = &j_k->v;
}