bcachefs: kill s_alloc, use bch_data_type

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

diff --git a/fs/bcachefs/btree_update_interior.c b/fs/bcachefs/btree_update_interior.c
index c0f1c77b340f6d7d774749f66e9583f6fc0f2eda..aba01a77e4af9f77d46941b99e8020c00c41caf5 100644 (file)
--- a/fs/bcachefs/btree_update_interior.c
+++ b/fs/bcachefs/btree_update_interior.c
@@ -184,7 +184,7 @@ found:
         */
        replicas = bch2_extent_nr_dirty_ptrs(k);
        if (replicas)
-               stats->s[replicas - 1].data[S_META] -= c->opts.btree_node_size;
+               stats->s[replicas - 1].data[BCH_DATA_BTREE] -= c->opts.btree_node_size;
 
        /*
         * We're dropping @k from the btree, but it's still live until the

diff --git a/fs/bcachefs/buckets.c b/fs/bcachefs/buckets.c
index 06ef268fd9917831d0277afa730463053a231977..c0dc0ce1f5850eb1247fbed3699427f201e3558e 100644 (file)
--- a/fs/bcachefs/buckets.c
+++ b/fs/bcachefs/buckets.c
@@ -82,16 +82,14 @@ static void bch2_fs_stats_verify(struct bch_fs *c)
 {
        struct bch_fs_usage stats =
                __bch2_fs_usage_read(c);
-       unsigned i;
+       unsigned i, j;
 
        for (i = 0; i < ARRAY_SIZE(stats.s); i++) {
-               if ((s64) stats.s[i].data[S_META] < 0)
-                       panic("replicas %u meta underflow: %lli\n",
-                             i + 1, stats.s[i].data[S_META]);
-
-               if ((s64) stats.s[i].data[S_DIRTY] < 0)
-                       panic("replicas %u dirty underflow: %lli\n",
-                             i + 1, stats.s[i].data[S_DIRTY]);
+               for (j = 0; j < ARRAY_SIZE(stats.s[i].data); j++)
+                       if ((s64) stats.s[i].data[j] < 0)
+                               panic("replicas %u %s underflow: %lli\n",
+                                     i + 1, bch_data_types[j],
+                                     stats.s[i].data[j]);
 
                if ((s64) stats.s[i].persistent_reserved < 0)
                        panic("replicas %u reserved underflow: %lli\n",
@@ -247,12 +245,16 @@ struct fs_usage_sum {
 static inline struct fs_usage_sum __fs_usage_sum(struct bch_fs_usage stats)
 {
        struct fs_usage_sum sum = { 0 };
-       unsigned i;
+       unsigned i, j;
 
        for (i = 0; i < ARRAY_SIZE(stats.s); i++) {
-               sum.data += (stats.s[i].data[S_META] +
-                            stats.s[i].data[S_DIRTY]) * (i + 1);
-               sum.reserved += stats.s[i].persistent_reserved * (i + 1);
+               u64 a = 0;
+
+               for (j = 0; j < ARRAY_SIZE(stats.s[i].data); j++)
+                       a += stats.s[i].data[j];
+
+               sum.data        += a * (i + 1);
+               sum.reserved    += stats.s[i].persistent_reserved * (i + 1);
        }
 
        sum.reserved += stats.online_reserved;
@@ -641,8 +643,6 @@ void bch2_mark_key(struct bch_fs *c, struct bkey_s_c k,
                struct bkey_s_c_extent e = bkey_s_c_to_extent(k);
                const struct bch_extent_ptr *ptr;
                struct bch_extent_crc_unpacked crc;
-               enum s_alloc type = data_type == BCH_DATA_USER
-                       ? S_DIRTY : S_META;
                unsigned replicas = 0;
 
                BUG_ON(!sectors);
@@ -655,7 +655,7 @@ void bch2_mark_key(struct bch_fs *c, struct bkey_s_c k,
 
                if (replicas) {
                        BUG_ON(replicas - 1 > ARRAY_SIZE(stats->s));
-                       stats->s[replicas - 1].data[type] += sectors;
+                       stats->s[replicas - 1].data[data_type] += sectors;
                }
                break;
        }

diff --git a/fs/bcachefs/buckets.h b/fs/bcachefs/buckets.h
index 6b312d32238944eb4161585cc265e1a98f6a61e2..016201ba1b8bcac107e004b6d6d95b31a585439f 100644 (file)
--- a/fs/bcachefs/buckets.h
+++ b/fs/bcachefs/buckets.h
@@ -168,18 +168,6 @@ static inline u64 dev_buckets_free(struct bch_fs *c, struct bch_dev *ca)
 
 /* Filesystem usage: */
 
-static inline enum bch_data_type s_alloc_to_data_type(enum s_alloc s)
-{
-       switch (s) {
-       case S_META:
-               return BCH_DATA_BTREE;
-       case S_DIRTY:
-               return BCH_DATA_USER;
-       default:
-               BUG();
-       }
-}
-
 struct bch_fs_usage __bch2_fs_usage_read(struct bch_fs *);
 struct bch_fs_usage bch2_fs_usage_read(struct bch_fs *);
 void bch2_fs_usage_apply(struct bch_fs *, struct bch_fs_usage *,

diff --git a/fs/bcachefs/buckets_types.h b/fs/bcachefs/buckets_types.h
index cad35a70192d2519bf270f847f3d3b6f9110a024..d528194ccf7e6ef1f51d5d661e1b765e6e60237f 100644 (file)
--- a/fs/bcachefs/buckets_types.h
+++ b/fs/bcachefs/buckets_types.h
@@ -2,6 +2,7 @@
 #ifndef _BUCKETS_TYPES_H
 #define _BUCKETS_TYPES_H
 
+#include "bcachefs_format.h"
 #include "util.h"
 
 #define BUCKET_JOURNAL_SEQ_BITS                16
@@ -59,13 +60,6 @@ struct bch_dev_usage {
        u64                     sectors_fragmented;
 };
 
-/* kill, switch to bch_data_type? */
-enum s_alloc {
-       S_META,
-       S_DIRTY,
-       S_ALLOC_NR,
-};
-
 struct bch_fs_usage {
        /* all fields are in units of 512 byte sectors: */
        /* _uncompressed_ sectors: */
@@ -73,7 +67,7 @@ struct bch_fs_usage {
        u64                     available_cache;
 
        struct {
-               u64             data[S_ALLOC_NR];
+               u64             data[BCH_DATA_NR];
                u64             persistent_reserved;
        }                       s[BCH_REPLICAS_MAX];
 };

diff --git a/fs/bcachefs/chardev.c b/fs/bcachefs/chardev.c
index 2aa86331969afdb2cc15ded6687b8467a6cb15d1..283828fe2dc3de2a3d23990aba94b8afb92c8843 100644 (file)
--- a/fs/bcachefs/chardev.c
+++ b/fs/bcachefs/chardev.c
@@ -406,9 +406,8 @@ static long bch2_ioctl_usage(struct bch_fs *c,
                        dst.persistent_reserved[i] =
                                src.s[i].persistent_reserved;
 
-                       for (j = 0; j < S_ALLOC_NR; j++)
-                               dst.sectors[s_alloc_to_data_type(j)][i] =
-                                       src.s[i].data[j];
+                       for (j = 0; j < BCH_DATA_NR; j++)
+                               dst.sectors[j][i] = src.s[i].data[j];
                }
 
                ret = copy_to_user(&user_arg->fs, &dst, sizeof(dst));

diff --git a/fs/bcachefs/sysfs.c b/fs/bcachefs/sysfs.c
index 430dcbcb6e8a1e06e47b76c4a123ea9cb147085a..db8af44c7921c3d5e429b7429a7f6933162ef8fe 100644 (file)
--- a/fs/bcachefs/sysfs.c
+++ b/fs/bcachefs/sysfs.c
@@ -230,41 +230,34 @@ static size_t bch2_btree_cache_size(struct bch_fs *c)
 
 static ssize_t show_fs_alloc_debug(struct bch_fs *c, char *buf)
 {
+       char *out = buf, *end = buf + PAGE_SIZE;
        struct bch_fs_usage stats = bch2_fs_usage_read(c);
+       unsigned replicas, type;
+
+       out += scnprintf(out, end - out,
+                        "capacity:\t\t%llu\n",
+                        c->capacity);
+
+       for (replicas = 0; replicas < ARRAY_SIZE(stats.s); replicas++) {
+               out += scnprintf(out, end - out,
+                                "%u replicas:\n",
+                                replicas + 1);
+
+               for (type = BCH_DATA_SB; type < BCH_DATA_NR; type++)
+                       out += scnprintf(out, end - out,
+                                        "\t%s:\t\t%llu\n",
+                                        bch2_data_types[type],
+                                        stats.s[replicas].data[type]);
+               out += scnprintf(out, end - out,
+                                "\treserved:\t%llu\n",
+                                stats.s[replicas].persistent_reserved);
+       }
 
-       return scnprintf(buf, PAGE_SIZE,
-                        "capacity:\t\t%llu\n"
-                        "1 replicas:\n"
-                        "\tmeta:\t\t%llu\n"
-                        "\tdirty:\t\t%llu\n"
-                        "\treserved:\t%llu\n"
-                        "2 replicas:\n"
-                        "\tmeta:\t\t%llu\n"
-                        "\tdirty:\t\t%llu\n"
-                        "\treserved:\t%llu\n"
-                        "3 replicas:\n"
-                        "\tmeta:\t\t%llu\n"
-                        "\tdirty:\t\t%llu\n"
-                        "\treserved:\t%llu\n"
-                        "4 replicas:\n"
-                        "\tmeta:\t\t%llu\n"
-                        "\tdirty:\t\t%llu\n"
-                        "\treserved:\t%llu\n"
+       out += scnprintf(out, end - out,
                         "online reserved:\t%llu\n",
-                        c->capacity,
-                        stats.s[0].data[S_META],
-                        stats.s[0].data[S_DIRTY],
-                        stats.s[0].persistent_reserved,
-                        stats.s[1].data[S_META],
-                        stats.s[1].data[S_DIRTY],
-                        stats.s[1].persistent_reserved,
-                        stats.s[2].data[S_META],
-                        stats.s[2].data[S_DIRTY],
-                        stats.s[2].persistent_reserved,
-                        stats.s[3].data[S_META],
-                        stats.s[3].data[S_DIRTY],
-                        stats.s[3].persistent_reserved,
                         stats.online_reserved);
+
+       return out - buf;
 }
 
 static ssize_t bch2_compression_stats(struct bch_fs *c, char *buf)