bcachefs: Kill fs_usage_online

More dead code deletion.

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

diff --git a/fs/bcachefs/buckets.c b/fs/bcachefs/buckets.c
index a1257e9587429d008720b544e7fe5422ddcefeb6..12faf2ffda1c0515f4f37c4d09ec107cd3b8b295 100644 (file)
--- a/fs/bcachefs/buckets.c
+++ b/fs/bcachefs/buckets.c
@@ -37,16 +37,6 @@ static u64 reserve_factor(u64 r)
        return r + (round_up(r, (1 << RESERVE_FACTOR)) >> RESERVE_FACTOR);
 }
 
-u64 bch2_fs_sectors_used(struct bch_fs *c, struct bch_fs_usage_online *fs_usage)
-{
-       return min(fs_usage->u.b.hidden +
-                  fs_usage->u.b.btree +
-                  fs_usage->u.b.data +
-                  reserve_factor(fs_usage->u.b.reserved +
-                                 fs_usage->online_reserved),
-                  c->capacity);
-}
-
 static struct bch_fs_usage_short
 __bch2_fs_usage_read_short(struct bch_fs *c)
 {

diff --git a/fs/bcachefs/buckets.h b/fs/bcachefs/buckets.h
index e56fde47e453331cd923da90581a106734f6239c..42ff3e9df5871816f713f5d0d54c9c48afd8c696 100644 (file)
--- a/fs/bcachefs/buckets.h
+++ b/fs/bcachefs/buckets.h
@@ -283,23 +283,11 @@ static inline unsigned fs_usage_u64s(struct bch_fs *c)
        return __fs_usage_u64s(READ_ONCE(c->replicas.nr));
 }
 
-static inline unsigned __fs_usage_online_u64s(unsigned nr_replicas)
-{
-       return sizeof(struct bch_fs_usage_online) / sizeof(u64) + nr_replicas;
-}
-
-static inline unsigned fs_usage_online_u64s(struct bch_fs *c)
-{
-       return __fs_usage_online_u64s(READ_ONCE(c->replicas.nr));
-}
-
 static inline unsigned dev_usage_u64s(void)
 {
        return sizeof(struct bch_dev_usage) / sizeof(u64);
 }
 
-u64 bch2_fs_sectors_used(struct bch_fs *, struct bch_fs_usage_online *);
-
 struct bch_fs_usage_short
 bch2_fs_usage_read_short(struct bch_fs *);
 

diff --git a/fs/bcachefs/buckets_types.h b/fs/bcachefs/buckets_types.h
index a15e3f79b9cb3d539b044878d24696dd4a5c6a99..7ad15f8093485e0db75febed1e05b67d3c7d9b23 100644 (file)
--- a/fs/bcachefs/buckets_types.h
+++ b/fs/bcachefs/buckets_types.h
@@ -64,11 +64,6 @@ struct bch_fs_usage {
        u64                     replicas[];
 };
 
-struct bch_fs_usage_online {
-       u64                     online_reserved;
-       struct bch_fs_usage     u;
-};
-
 struct bch_fs_usage_short {
        u64                     capacity;
        u64                     used;