Update bcachefs sources to 90a9c61e2b bcachefs: Switch bch2_btree_delete_range()...

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

diff --git a/libbcachefs/journal.c b/libbcachefs/journal.c
index b561ed787493ed0c249e5bbcc4180f3358c4e60d..d77092aa069ee66826c30da8c1d5316cac857b06 100644 (file)
--- a/libbcachefs/journal.c
+++ b/libbcachefs/journal.c
@@ -883,7 +883,7 @@ static int __bch2_set_nr_journal_buckets(struct bch_dev *ca, unsigned nr,
 
        if (!new_fs) {
                for (i = 0; i < nr_got; i++) {
-                       ret = bch2_trans_do(c, NULL, NULL, BTREE_INSERT_NOFAIL,
+                       ret = bch2_trans_run(c,
                                bch2_trans_mark_metadata_bucket(&trans, ca,
                                                bu[i], BCH_DATA_journal,
                                                ca->mi.bucket_size));
@@ -1146,7 +1146,7 @@ int bch2_dev_journal_init(struct bch_dev *ca, struct bch_sb *sb)
                bch2_sb_get_journal(sb);
        struct bch_sb_field_journal_v2 *journal_buckets_v2 =
                bch2_sb_get_journal_v2(sb);
-       unsigned i;
+       unsigned i, nr_bvecs;
 
        ja->nr = 0;
 
@@ -1163,11 +1163,14 @@ int bch2_dev_journal_init(struct bch_dev *ca, struct bch_sb *sb)
        if (!ja->bucket_seq)
                return -ENOMEM;
 
-       ca->journal.bio = bio_kmalloc(GFP_KERNEL,
-                       DIV_ROUND_UP(JOURNAL_ENTRY_SIZE_MAX, PAGE_SIZE));
+       nr_bvecs = DIV_ROUND_UP(JOURNAL_ENTRY_SIZE_MAX, PAGE_SIZE);
+
+       ca->journal.bio = bio_kmalloc(nr_bvecs, GFP_KERNEL);
        if (!ca->journal.bio)
                return -ENOMEM;
 
+       bio_init(ca->journal.bio, NULL, ca->journal.bio->bi_inline_vecs, nr_bvecs, 0);
+
        ja->buckets = kcalloc(ja->nr, sizeof(u64), GFP_KERNEL);
        if (!ja->buckets)
                return -ENOMEM;