Update bcachefs sources to ca3cfad39f fixup! bcachefs: Improve iter->should_be_locked

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

diff --git a/libbcachefs/btree_update_interior.c b/libbcachefs/btree_update_interior.c
index 2d8093d1bf00b1dddf67bfd09098ab9b0061d994..cd214599a03f194fc5212801a92659bffceb6b37 100644 (file)
--- a/libbcachefs/btree_update_interior.c
+++ b/libbcachefs/btree_update_interior.c
@@ -511,7 +511,7 @@ static int btree_update_nodes_written_trans(struct btree_trans *trans,
                ret = bch2_trans_mark_key(trans,
                                          bkey_s_c_null,
                                          bkey_i_to_s_c(k),
-                                         0, 0, BTREE_TRIGGER_INSERT);
+                                         BTREE_TRIGGER_INSERT);
                if (ret)
                        return ret;
        }
@@ -520,7 +520,7 @@ static int btree_update_nodes_written_trans(struct btree_trans *trans,
                ret = bch2_trans_mark_key(trans,
                                          bkey_i_to_s_c(k),
                                          bkey_s_c_null,
-                                         0, 0, BTREE_TRIGGER_OVERWRITE);
+                                         BTREE_TRIGGER_OVERWRITE);
                if (ret)
                        return ret;
        }
@@ -937,6 +937,8 @@ bch2_btree_update_start(struct btree_iter *iter, unsigned level,
        int journal_flags = 0;
        int ret = 0;
 
+       BUG_ON(!iter->should_be_locked);
+
        if (flags & BTREE_INSERT_JOURNAL_RESERVED)
                journal_flags |= JOURNAL_RES_GET_RESERVED;