Update bcachefs sources to 8e1519ccb6 bcachefs: Add tracepoint & counter for btree...

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

diff --git a/libbcachefs/btree_update_interior.c b/libbcachefs/btree_update_interior.c
index 172fd3b6cfc258eabd1d3bcf9c454fb0f361590f..f1e796336dde3379e8577d5d3318b3919d080643 100644 (file)
--- a/libbcachefs/btree_update_interior.c
+++ b/libbcachefs/btree_update_interior.c
@@ -1716,8 +1716,10 @@ split:
         * We could attempt to avoid the transaction restart, by calling
         * bch2_btree_path_upgrade() and allocating more nodes:
         */
-       if (b->c.level >= as->update_level)
+       if (b->c.level >= as->update_level) {
+               trace_and_count(c, trans_restart_split_race, trans, _THIS_IP_);
                return btree_trans_restart(trans, BCH_ERR_transaction_restart_split_race);
+       }
 
        return btree_split(as, trans, path, b, keys, flags);
 }
@@ -2401,20 +2403,15 @@ bool bch2_btree_interior_updates_flush(struct bch_fs *c)
        return ret;
 }
 
-void bch2_journal_entries_to_btree_roots(struct bch_fs *c, struct jset *jset)
+void bch2_journal_entry_to_btree_root(struct bch_fs *c, struct jset_entry *entry)
 {
-       struct btree_root *r;
-       struct jset_entry *entry;
+       struct btree_root *r = &c->btree_roots[entry->btree_id];
 
        mutex_lock(&c->btree_root_lock);
 
-       vstruct_for_each(jset, entry)
-               if (entry->type == BCH_JSET_ENTRY_btree_root) {
-                       r = &c->btree_roots[entry->btree_id];
-                       r->level = entry->level;
-                       r->alive = true;
-                       bkey_copy(&r->key, &entry->start[0]);
-               }
+       r->level = entry->level;
+       r->alive = true;
+       bkey_copy(&r->key, &entry->start[0]);
 
        mutex_unlock(&c->btree_root_lock);
 }