Update bcachefs sources to d267e10a43b2 bcachefs: __bch2_sb_field_to_text()

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

diff --git a/libbcachefs/btree_update_interior.c b/libbcachefs/btree_update_interior.c
index 2a93eb92d1129680724681ef62c12bd207c56ae9..44f9dfa28a09d89984150b19d3831077a18485f1 100644 (file)
--- a/libbcachefs/btree_update_interior.c
+++ b/libbcachefs/btree_update_interior.c
@@ -568,7 +568,8 @@ static int btree_update_nodes_written_trans(struct btree_trans *trans,
        for_each_keylist_key(&as->old_keys, k) {
                unsigned level = bkey_i_to_btree_ptr_v2(k)->v.mem_ptr;
 
-               ret = bch2_trans_mark_old(trans, as->btree_id, level, bkey_i_to_s_c(k), 0);
+               ret = bch2_key_trigger_old(trans, as->btree_id, level, bkey_i_to_s_c(k),
+                                          BTREE_TRIGGER_TRANSACTIONAL);
                if (ret)
                        return ret;
        }
@@ -576,7 +577,8 @@ static int btree_update_nodes_written_trans(struct btree_trans *trans,
        for_each_keylist_key(&as->new_keys, k) {
                unsigned level = bkey_i_to_btree_ptr_v2(k)->v.mem_ptr;
 
-               ret = bch2_trans_mark_new(trans, as->btree_id, level, k, 0);
+               ret = bch2_key_trigger_new(trans, as->btree_id, level, bkey_i_to_s(k),
+                                          BTREE_TRIGGER_TRANSACTIONAL);
                if (ret)
                        return ret;
        }
@@ -2156,13 +2158,12 @@ static int __bch2_btree_node_update_key(struct btree_trans *trans,
        int ret;
 
        if (!skip_triggers) {
-               ret = bch2_trans_mark_old(trans, b->c.btree_id, b->c.level + 1,
-                                         bkey_i_to_s_c(&b->key), 0);
-               if (ret)
-                       return ret;
-
-               ret = bch2_trans_mark_new(trans, b->c.btree_id, b->c.level + 1,
-                                         new_key, 0);
+               ret   = bch2_key_trigger_old(trans, b->c.btree_id, b->c.level + 1,
+                                            bkey_i_to_s_c(&b->key),
+                                            BTREE_TRIGGER_TRANSACTIONAL) ?:
+                       bch2_key_trigger_new(trans, b->c.btree_id, b->c.level + 1,
+                                            bkey_i_to_s(new_key),
+                                            BTREE_TRIGGER_TRANSACTIONAL);
                if (ret)
                        return ret;
        }