Update bcachefs sources to 2272c5f5b7 bcachefs: Mark stripe buckets with correct...

[bcachefs-tools-debian] / libbcachefs / btree_update_leaf.c

diff --git a/libbcachefs/btree_update_leaf.c b/libbcachefs/btree_update_leaf.c
index 4ff498010af28f13824154cc0ec5106f684d72b6..c93c132dd815d963360dfe5060dd74925e3ba915 100644 (file)
--- a/libbcachefs/btree_update_leaf.c
+++ b/libbcachefs/btree_update_leaf.c
@@ -434,7 +434,8 @@ static int run_one_mem_trigger(struct btree_trans *trans,
        if (bch2_bkey_ops[old.k->type].atomic_trigger ==
            bch2_bkey_ops[i->k->k.type].atomic_trigger &&
            ((1U << old.k->type) & BTREE_TRIGGER_WANTS_OLD_AND_NEW)) {
-               ret   = bch2_mark_key(trans, old, bkey_i_to_s_c(new),
+               ret   = bch2_mark_key(trans, i->btree_id, i->level,
+                               old, bkey_i_to_s_c(new),
                                BTREE_TRIGGER_INSERT|BTREE_TRIGGER_OVERWRITE|flags);
        } else {
                struct bkey             _deleted = KEY(0, 0, 0);
@@ -442,9 +443,11 @@ static int run_one_mem_trigger(struct btree_trans *trans,
 
                _deleted.p = i->path->pos;
 
-               ret   = bch2_mark_key(trans, deleted, bkey_i_to_s_c(new),
+               ret   = bch2_mark_key(trans, i->btree_id, i->level,
+                               deleted, bkey_i_to_s_c(new),
                                BTREE_TRIGGER_INSERT|flags) ?:
-                       bch2_mark_key(trans, old, deleted,
+                       bch2_mark_key(trans, i->btree_id, i->level,
+                               old, deleted,
                                BTREE_TRIGGER_OVERWRITE|flags);
        }