bcachefs: Kill bch2_bucket_gens_read()

This folds bch2_bucket_gens_read() into bch2_alloc_read(), doing the
version check there.

This is prep work for enumarating all recovery passes: we need some
cleanup first to make calling all the recovery passes consistent.

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

diff --git a/fs/bcachefs/alloc_background.c b/fs/bcachefs/alloc_background.c
index 0fc810ca5b6bd06ff3bae8d2bf0d32272f8803f8..9b444bb8683c63038028d894ac7279998e1f12c1 100644 (file)
--- a/fs/bcachefs/alloc_background.c
+++ b/fs/bcachefs/alloc_background.c
@@ -551,40 +551,6 @@ err:
        return ERR_PTR(ret);
 }
 
-int bch2_alloc_read(struct bch_fs *c)
-{
-       struct btree_trans trans;
-       struct btree_iter iter;
-       struct bkey_s_c k;
-       struct bch_alloc_v4 a;
-       struct bch_dev *ca;
-       int ret;
-
-       bch2_trans_init(&trans, c, 0, 0);
-
-       for_each_btree_key(&trans, iter, BTREE_ID_alloc, POS_MIN,
-                          BTREE_ITER_PREFETCH, k, ret) {
-               /*
-                * Not a fsck error because this is checked/repaired by
-                * bch2_check_alloc_key() which runs later:
-                */
-               if (!bch2_dev_bucket_exists(c, k.k->p))
-                       continue;
-
-               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);
-
-       bch2_trans_exit(&trans);
-
-       if (ret)
-               bch_err_fn(c, ret);
-
-       return ret;
-}
-
 static struct bpos alloc_gens_pos(struct bpos pos, unsigned *offset)
 {
        *offset = pos.offset & KEY_TYPE_BUCKET_GENS_MASK;
@@ -692,45 +658,67 @@ int bch2_bucket_gens_init(struct bch_fs *c)
        return ret;
 }
 
-int bch2_bucket_gens_read(struct bch_fs *c)
+int bch2_alloc_read(struct bch_fs *c)
 {
        struct btree_trans trans;
        struct btree_iter iter;
        struct bkey_s_c k;
-       const struct bch_bucket_gens *g;
        struct bch_dev *ca;
-       u64 b;
        int ret;
 
+       down_read(&c->gc_lock);
        bch2_trans_init(&trans, c, 0, 0);
 
-       for_each_btree_key(&trans, iter, BTREE_ID_bucket_gens, POS_MIN,
-                          BTREE_ITER_PREFETCH, k, ret) {
-               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;
+       if (c->sb.version_upgrade_complete >= bcachefs_metadata_version_bucket_gens) {
+               const struct bch_bucket_gens *g;
+               u64 b;
 
-               if (k.k->type != KEY_TYPE_bucket_gens)
-                       continue;
+               for_each_btree_key(&trans, iter, BTREE_ID_bucket_gens, POS_MIN,
+                                  BTREE_ITER_PREFETCH, k, ret) {
+                       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;
 
-               g = bkey_s_c_to_bucket_gens(k).v;
+                       if (k.k->type != KEY_TYPE_bucket_gens)
+                               continue;
 
-               /*
-                * Not a fsck error because this is checked/repaired by
-                * bch2_check_alloc_key() which runs later:
-                */
-               if (!bch2_dev_exists2(c, k.k->p.inode))
-                       continue;
+                       g = bkey_s_c_to_bucket_gens(k).v;
+
+                       /*
+                        * Not a fsck error because this is checked/repaired by
+                        * bch2_check_alloc_key() which runs later:
+                        */
+                       if (!bch2_dev_exists2(c, k.k->p.inode))
+                               continue;
 
-               ca = bch_dev_bkey_exists(c, k.k->p.inode);
+                       ca = bch_dev_bkey_exists(c, k.k->p.inode);
+
+                       for (b = max_t(u64, ca->mi.first_bucket, start);
+                            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);
+       } else {
+               struct bch_alloc_v4 a;
 
-               for (b = max_t(u64, ca->mi.first_bucket, start);
-                    b < min_t(u64, ca->mi.nbuckets, end);
-                    b++)
-                       *bucket_gen(ca, b) = g->gens[b & KEY_TYPE_BUCKET_GENS_MASK];
+               for_each_btree_key(&trans, iter, BTREE_ID_alloc, POS_MIN,
+                                  BTREE_ITER_PREFETCH, k, ret) {
+                       /*
+                        * Not a fsck error because this is checked/repaired by
+                        * bch2_check_alloc_key() which runs later:
+                        */
+                       if (!bch2_dev_bucket_exists(c, k.k->p))
+                               continue;
+
+                       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);
        }
-       bch2_trans_iter_exit(&trans, &iter);
 
        bch2_trans_exit(&trans);
+       up_read(&c->gc_lock);
 
        if (ret)
                bch_err_fn(c, ret);

diff --git a/fs/bcachefs/alloc_background.h b/fs/bcachefs/alloc_background.h
index d1bf45a4b404aaaeca4b11289bad4ba4b89f4b3d..c0914feb54b5faecaca91dbb845880456947a84f 100644 (file)
--- a/fs/bcachefs/alloc_background.h
+++ b/fs/bcachefs/alloc_background.h
@@ -212,7 +212,6 @@ static inline bool bkey_is_alloc(const struct bkey *k)
 }
 
 int bch2_alloc_read(struct bch_fs *);
-int bch2_bucket_gens_read(struct bch_fs *);
 
 int bch2_trans_mark_alloc(struct btree_trans *, enum btree_id, unsigned,
                          struct bkey_s_c, struct bkey_i *, unsigned);

diff --git a/fs/bcachefs/recovery.c b/fs/bcachefs/recovery.c
index c90205aa223e52a496764d63de61f9a5ad6b7707..4c61a28e492c7a5a0398b74ce30c6c75d40e7487 100644 (file)
--- a/fs/bcachefs/recovery.c
+++ b/fs/bcachefs/recovery.c
@@ -1309,11 +1309,7 @@ use_clean:
                goto err;
 
        bch_verbose(c, "starting alloc read");
-       down_read(&c->gc_lock);
-       ret = c->sb.version < bcachefs_metadata_version_bucket_gens
-               ? bch2_alloc_read(c)
-               : bch2_bucket_gens_read(c);
-       up_read(&c->gc_lock);
+       ret = bch2_alloc_read(c);
        if (ret)
                goto err;
        bch_verbose(c, "alloc read done");