Update bcachefs sources to 9d28e4a535 bcachefs: bch2_journal_entry_to_text()

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

diff --git a/libbcachefs/recovery.c b/libbcachefs/recovery.c
index 0b923037d236fb847490979ba4658be77171b6c1..d332fd16517b983766950e67a7ba4070d85204bd 100644 (file)
--- a/libbcachefs/recovery.c
+++ b/libbcachefs/recovery.c
@@ -714,15 +714,15 @@ static int journal_replay_entry_early(struct bch_fs *c,
                        container_of(entry, struct jset_entry_usage, entry);
 
                switch (entry->btree_id) {
-               case FS_USAGE_RESERVED:
+               case BCH_FS_USAGE_reserved:
                        if (entry->level < BCH_REPLICAS_MAX)
                                c->usage_base->persistent_reserved[entry->level] =
                                        le64_to_cpu(u->v);
                        break;
-               case FS_USAGE_INODES:
+               case BCH_FS_USAGE_inodes:
                        c->usage_base->nr_inodes = le64_to_cpu(u->v);
                        break;
-               case FS_USAGE_KEY_VERSION:
+               case BCH_FS_USAGE_key_version:
                        atomic64_set(&c->key_version,
                                     le64_to_cpu(u->v));
                        break;
@@ -742,10 +742,7 @@ static int journal_replay_entry_early(struct bch_fs *c,
                struct jset_entry_dev_usage *u =
                        container_of(entry, struct jset_entry_dev_usage, entry);
                struct bch_dev *ca = bch_dev_bkey_exists(c, le32_to_cpu(u->dev));
-               unsigned bytes = jset_u64s(le16_to_cpu(entry->u64s)) * sizeof(u64);
-               unsigned nr_types = (bytes - sizeof(struct jset_entry_dev_usage)) /
-                       sizeof(struct jset_entry_dev_usage_type);
-               unsigned i;
+               unsigned i, nr_types = jset_entry_dev_usage_nr_types(u);
 
                ca->usage_base->buckets_ec              = le64_to_cpu(u->buckets_ec);
                ca->usage_base->buckets_unavailable     = le64_to_cpu(u->buckets_unavailable);