Update bcachefs sources to bed61fae3b bcachefs: Delete a faulty assertion

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

diff --git a/libbcachefs/btree_update_interior.c b/libbcachefs/btree_update_interior.c
index 3659b2c08109b71bb09e5d7fc166b6f049e92ab2..c741150e68af971d144e752df543078bf1396bf8 100644 (file)
--- a/libbcachefs/btree_update_interior.c
+++ b/libbcachefs/btree_update_interior.c
@@ -5,6 +5,7 @@
 #include "bkey_methods.h"
 #include "btree_cache.h"
 #include "btree_gc.h"
+#include "btree_journal_iter.h"
 #include "btree_update.h"
 #include "btree_update_interior.h"
 #include "btree_io.h"
@@ -17,7 +18,6 @@
 #include "journal.h"
 #include "journal_reclaim.h"
 #include "keylist.h"
-#include "recovery.h"
 #include "replicas.h"
 #include "super-io.h"
 #include "trace.h"
@@ -188,7 +188,7 @@ static void bch2_btree_node_free_inmem(struct btree_trans *trans,
        bch2_btree_node_hash_remove(&c->btree_cache, b);
        __btree_node_free(c, b);
        six_unlock_write(&b->c.lock);
-       mark_btree_node_locked_noreset(path, level, SIX_LOCK_intent);
+       mark_btree_node_locked_noreset(path, level, BTREE_NODE_INTENT_LOCKED);
 
        trans_for_each_path(trans, path)
                if (path->l[level].b == b) {
@@ -720,7 +720,7 @@ err:
 
                mutex_unlock(&c->btree_interior_update_lock);
 
-               mark_btree_node_locked_noreset(path, b->c.level, SIX_LOCK_intent);
+               mark_btree_node_locked_noreset(path, b->c.level, BTREE_NODE_INTENT_LOCKED);
                six_unlock_write(&b->c.lock);
 
                btree_node_write_if_need(c, b, SIX_LOCK_intent);
@@ -2385,7 +2385,7 @@ void bch2_btree_updates_to_text(struct printbuf *out, struct bch_fs *c)
                       as,
                       as->mode,
                       as->nodes_written,
-                      atomic_read(&as->cl.remaining) & CLOSURE_REMAINING_MASK,
+                      closure_nr_remaining(&as->cl),
                       as->journal.seq);
        mutex_unlock(&c->btree_interior_update_lock);
 }