bcachefs: Kill bch2_fs_usage_initialize()

Deleting code for the old disk accounting scheme.

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

diff --git a/fs/bcachefs/buckets.c b/fs/bcachefs/buckets.c
index 37347159ef4d053d2269b6d4b59577bc7bea8152..2fd7a55f6373be277813af00d27415f122f0bfff 100644 (file)
--- a/fs/bcachefs/buckets.c
+++ b/fs/bcachefs/buckets.c
@@ -38,35 +38,6 @@ static inline struct bch_fs_usage *fs_usage_ptr(struct bch_fs *c,
                            : c->usage[journal_seq & JOURNAL_BUF_MASK]);
 }
 
-void bch2_fs_usage_initialize(struct bch_fs *c)
-{
-       percpu_down_write(&c->mark_lock);
-       struct bch_fs_usage *usage = c->usage_base;
-
-       for (unsigned i = 0; i < ARRAY_SIZE(c->usage); i++)
-               bch2_fs_usage_acc_to_base(c, i);
-
-       for (unsigned i = 0; i < BCH_REPLICAS_MAX; i++)
-               usage->b.reserved += usage->persistent_reserved[i];
-
-       for (unsigned i = 0; i < c->replicas.nr; i++) {
-               struct bch_replicas_entry_v1 *e =
-                       cpu_replicas_entry(&c->replicas, i);
-
-               fs_usage_data_type_to_base(&usage->b, e->data_type, usage->replicas[i]);
-       }
-
-       for_each_member_device(c, ca) {
-               struct bch_dev_usage dev = bch2_dev_usage_read(ca);
-
-               usage->b.hidden += (dev.d[BCH_DATA_sb].buckets +
-                                 dev.d[BCH_DATA_journal].buckets) *
-                       ca->mi.bucket_size;
-       }
-
-       percpu_up_write(&c->mark_lock);
-}
-
 void bch2_dev_usage_read_fast(struct bch_dev *ca, struct bch_dev_usage *usage)
 {
        memset(usage, 0, sizeof(*usage));

diff --git a/fs/bcachefs/buckets.h b/fs/bcachefs/buckets.h
index b61942fc3090ac5611366621327585fe0183b24a..dc99df654ac91f354c4de028adfa1efa86827da2 100644 (file)
--- a/fs/bcachefs/buckets.h
+++ b/fs/bcachefs/buckets.h
@@ -318,8 +318,6 @@ void bch2_dev_usage_update(struct bch_fs *, struct bch_dev *,
 int bch2_update_replicas(struct bch_fs *, struct bkey_s_c,
                         struct bch_replicas_entry_v1 *, s64);
 
-void bch2_fs_usage_initialize(struct bch_fs *);
-
 int bch2_bucket_ref_update(struct btree_trans *, struct bch_dev *,
                           struct bkey_s_c, const struct bch_extent_ptr *,
                           s64, enum bch_data_type, u8, u8, u32 *);

diff --git a/fs/bcachefs/recovery.c b/fs/bcachefs/recovery.c
index fcc8d5bc6c2f5281db79328c1d4c9015e79a2b3d..abdb26d4506881003637a1cbc2991f2f3a4ee330 100644 (file)
--- a/fs/bcachefs/recovery.c
+++ b/fs/bcachefs/recovery.c
@@ -509,8 +509,6 @@ static int journal_replay_early(struct bch_fs *c,
                }
        }
 
-       bch2_fs_usage_initialize(c);
-
        return 0;
 }