Update bcachefs sources to 841a95c29f4c bcachefs: fix userspace build errors

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

diff --git a/libbcachefs/alloc_background.c b/libbcachefs/alloc_background.c
index ad4ad795b3bcedd91e9355fe1df8ab8f9bff7767..769c37f9e90710c1db2531d6b318c9e819249d71 100644 (file)
--- a/libbcachefs/alloc_background.c
+++ b/libbcachefs/alloc_background.c
@@ -544,8 +544,8 @@ int bch2_bucket_gens_init(struct bch_fs *c)
        u8 gen;
        int ret;
 
-       for_each_btree_key(trans, iter, BTREE_ID_alloc, POS_MIN,
-                          BTREE_ITER_PREFETCH, k, ret) {
+       ret = for_each_btree_key(trans, iter, BTREE_ID_alloc, POS_MIN,
+                                BTREE_ITER_PREFETCH, k, ({
                /*
                 * Not a fsck error because this is checked/repaired by
                 * bch2_check_alloc_key() which runs later:
@@ -572,8 +572,8 @@ int bch2_bucket_gens_init(struct bch_fs *c)
                }
 
                g.v.gens[offset] = gen;
-       }
-       bch2_trans_iter_exit(trans, &iter);
+               0;
+       }));
 
        if (have_bucket_gens_key && !ret)
                ret = commit_do(trans, NULL, NULL,
@@ -582,8 +582,7 @@ int bch2_bucket_gens_init(struct bch_fs *c)
 
        bch2_trans_put(trans);
 
-       if (ret)
-               bch_err_fn(c, ret);
+       bch_err_fn(c, ret);
        return ret;
 }
 
@@ -601,8 +600,8 @@ int bch2_alloc_read(struct bch_fs *c)
                const struct bch_bucket_gens *g;
                u64 b;
 
-               for_each_btree_key(trans, iter, BTREE_ID_bucket_gens, POS_MIN,
-                                  BTREE_ITER_PREFETCH, k, ret) {
+               ret = for_each_btree_key(trans, iter, BTREE_ID_bucket_gens, POS_MIN,
+                                        BTREE_ITER_PREFETCH, k, ({
                        u64 start = bucket_gens_pos_to_alloc(k.k->p, 0).offset;
                        u64 end = bucket_gens_pos_to_alloc(bpos_nosnap_successor(k.k->p), 0).offset;
 
@@ -624,13 +623,13 @@ int bch2_alloc_read(struct bch_fs *c)
                             b < min_t(u64, ca->mi.nbuckets, end);
                             b++)
                                *bucket_gen(ca, b) = g->gens[b & KEY_TYPE_BUCKET_GENS_MASK];
-               }
-               bch2_trans_iter_exit(trans, &iter);
+                       0;
+               }));
        } else {
                struct bch_alloc_v4 a;
 
-               for_each_btree_key(trans, iter, BTREE_ID_alloc, POS_MIN,
-                                  BTREE_ITER_PREFETCH, k, ret) {
+               ret = for_each_btree_key(trans, iter, BTREE_ID_alloc, POS_MIN,
+                                        BTREE_ITER_PREFETCH, k, ({
                        /*
                         * Not a fsck error because this is checked/repaired by
                         * bch2_check_alloc_key() which runs later:
@@ -641,16 +640,14 @@ int bch2_alloc_read(struct bch_fs *c)
                        ca = bch_dev_bkey_exists(c, k.k->p.inode);
 
                        *bucket_gen(ca, k.k->p.offset) = bch2_alloc_to_v4(k, &a)->gen;
-               }
-               bch2_trans_iter_exit(trans, &iter);
+                       0;
+               }));
        }
 
        bch2_trans_put(trans);
        up_read(&c->gc_lock);
 
-       if (ret)
-               bch_err_fn(c, ret);
-
+       bch_err_fn(c, ret);
        return ret;
 }
 
@@ -876,8 +873,9 @@ static struct bkey_s_c bch2_get_key_or_hole(struct btree_iter *iter, struct bpos
 
                bch2_trans_copy_iter(&iter2, iter);
 
-               if (!bpos_eq(iter->path->l[0].b->key.k.p, SPOS_MAX))
-                       end = bkey_min(end, bpos_nosnap_successor(iter->path->l[0].b->key.k.p));
+               struct btree_path *path = btree_iter_path(iter->trans, iter);
+               if (!bpos_eq(path->l[0].b->key.k.p, SPOS_MAX))
+                       end = bkey_min(end, bpos_nosnap_successor(path->l[0].b->key.k.p));
 
                end = bkey_min(end, POS(iter->pos.inode, iter->pos.offset + U32_MAX - 1));
 
@@ -1430,7 +1428,7 @@ bkey_err:
        if (ret < 0)
                goto err;
 
-       ret = for_each_btree_key2(trans, iter,
+       ret = for_each_btree_key(trans, iter,
                        BTREE_ID_need_discard, POS_MIN,
                        BTREE_ITER_PREFETCH, k,
                bch2_check_discard_freespace_key(trans, &iter));
@@ -1696,8 +1694,8 @@ static void bch2_do_discards_work(struct work_struct *work)
         * successful commit:
         */
        ret = bch2_trans_run(c,
-               for_each_btree_key2(trans, iter,
-                               BTREE_ID_need_discard, POS_MIN, 0, k,
+               for_each_btree_key(trans, iter,
+                                  BTREE_ID_need_discard, POS_MIN, 0, k,
                        bch2_discard_one_bucket(trans, &iter, &discard_pos_done,
                                                &seen,
                                                &open,