Update bcachefs sources to 0342eebf85 bcachefs: Improve the backpointer to missing...

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

diff --git a/libbcachefs/btree_update_interior.c b/libbcachefs/btree_update_interior.c
index f1e796336dde3379e8577d5d3318b3919d080643..4d63c4d766677934c0d55fd7bc83c1fb8a09ce2b 100644 (file)
--- a/libbcachefs/btree_update_interior.c
+++ b/libbcachefs/btree_update_interior.c
@@ -242,7 +242,7 @@ static struct btree *__bch2_btree_node_alloc(struct btree_trans *trans,
        struct bch_fs *c = trans->c;
        struct write_point *wp;
        struct btree *b;
-       __BKEY_PADDED(k, BKEY_BTREE_PTR_VAL_U64s_MAX) tmp;
+       BKEY_PADDED_ONSTACK(k, BKEY_BTREE_PTR_VAL_U64s_MAX) tmp;
        struct open_buckets ob = { .nr = 0 };
        struct bch_devs_list devs_have = (struct bch_devs_list) { 0 };
        unsigned nr_reserve;
@@ -300,7 +300,7 @@ retry:
        bch2_open_bucket_get(c, wp, &ob);
        bch2_alloc_sectors_done(c, wp);
 mem_alloc:
-       b = bch2_btree_node_mem_alloc(c, interior_node);
+       b = bch2_btree_node_mem_alloc(trans, interior_node);
        six_unlock_write(&b->c.lock);
        six_unlock_intent(&b->c.lock);
 
@@ -1412,7 +1412,7 @@ static void __btree_split_node(struct btree_update *as,
                out[i]->needs_whiteout = false;
 
                btree_keys_account_key_add(&n[i]->nr, 0, out[i]);
-               out[i] = bkey_next(out[i]);
+               out[i] = bkey_p_next(out[i]);
        }
 
        for (i = 0; i < 2; i++) {
@@ -2260,7 +2260,7 @@ int bch2_btree_node_update_key(struct btree_trans *trans, struct btree_iter *ite
                                return ret;
                }
 
-               new_hash = bch2_btree_node_mem_alloc(c, false);
+               new_hash = bch2_btree_node_mem_alloc(trans, false);
        }
 
        path->intent_ref++;
@@ -2323,8 +2323,9 @@ void bch2_btree_set_root_for_read(struct bch_fs *c, struct btree *b)
        bch2_btree_set_root_inmem(c, b);
 }
 
-void bch2_btree_root_alloc(struct bch_fs *c, enum btree_id id)
+static int __bch2_btree_root_alloc(struct btree_trans *trans, enum btree_id id)
 {
+       struct bch_fs *c = trans->c;
        struct closure cl;
        struct btree *b;
        int ret;
@@ -2336,7 +2337,7 @@ void bch2_btree_root_alloc(struct bch_fs *c, enum btree_id id)
                closure_sync(&cl);
        } while (ret);
 
-       b = bch2_btree_node_mem_alloc(c, false);
+       b = bch2_btree_node_mem_alloc(trans, false);
        bch2_btree_cache_cannibalize_unlock(c);
 
        set_btree_node_fake(b);
@@ -2365,6 +2366,12 @@ void bch2_btree_root_alloc(struct bch_fs *c, enum btree_id id)
 
        six_unlock_write(&b->c.lock);
        six_unlock_intent(&b->c.lock);
+       return 0;
+}
+
+void bch2_btree_root_alloc(struct bch_fs *c, enum btree_id id)
+{
+       bch2_trans_run(c, __bch2_btree_root_alloc(&trans, id));
 }
 
 void bch2_btree_updates_to_text(struct printbuf *out, struct bch_fs *c)
@@ -2437,7 +2444,7 @@ bch2_btree_roots_to_journal_entries(struct bch_fs *c,
                                          BCH_JSET_ENTRY_btree_root,
                                          i, c->btree_roots[i].level,
                                          &c->btree_roots[i].key,
-                                         c->btree_roots[i].key.u64s);
+                                         c->btree_roots[i].key.k.u64s);
                        end = vstruct_next(end);
                }
 
@@ -2467,8 +2474,11 @@ int bch2_fs_btree_interior_update_init(struct bch_fs *c)
        c->btree_interior_update_worker =
                alloc_workqueue("btree_update", WQ_UNBOUND|WQ_MEM_RECLAIM, 1);
        if (!c->btree_interior_update_worker)
-               return -ENOMEM;
+               return -BCH_ERR_ENOMEM_btree_interior_update_worker_init;
 
-       return mempool_init_kmalloc_pool(&c->btree_interior_update_pool, 1,
-                                        sizeof(struct btree_update));
+       if (mempool_init_kmalloc_pool(&c->btree_interior_update_pool, 1,
+                                     sizeof(struct btree_update)))
+               return -BCH_ERR_ENOMEM_btree_interior_update_pool_init;
+
+       return 0;
 }