bcachefs: counters.c -> sb-counters.c

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

diff --git a/fs/bcachefs/Makefile b/fs/bcachefs/Makefile
index 7423a3557c6807a620831475e8608a690fd3315f..1a05cecda7cc5c47695911e7d715aa215f26688d 100644 (file)
--- a/fs/bcachefs/Makefile
+++ b/fs/bcachefs/Makefile
@@ -27,7 +27,6 @@ bcachefs-y            :=      \
        checksum.o              \
        clock.o                 \
        compress.o              \
-       counters.o              \
        darray.o                \
        debug.o                 \
        dirent.o                \
@@ -71,6 +70,7 @@ bcachefs-y            :=      \
        reflink.o               \
        replicas.o              \
        sb-clean.o              \
+       sb-counters.o           \
        sb-downgrade.o          \
        sb-errors.o             \
        sb-members.o            \

diff --git a/fs/bcachefs/counters.c b/fs/bcachefs/counters.c
deleted file mode 100644 (file)
index 02a996e..0000000
--- a/fs/bcachefs/counters.c
+++ /dev/null
@@ -1,107 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-#include "bcachefs.h"
-#include "super-io.h"
-#include "counters.h"
-
-/* BCH_SB_FIELD_counters */
-
-static const char * const bch2_counter_names[] = {
-#define x(t, n, ...) (#t),
-       BCH_PERSISTENT_COUNTERS()
-#undef x
-       NULL
-};
-
-static size_t bch2_sb_counter_nr_entries(struct bch_sb_field_counters *ctrs)
-{
-       if (!ctrs)
-               return 0;
-
-       return (__le64 *) vstruct_end(&ctrs->field) - &ctrs->d[0];
-};
-
-static int bch2_sb_counters_validate(struct bch_sb *sb,
-                                    struct bch_sb_field *f,
-                                    struct printbuf *err)
-{
-       return 0;
-};
-
-static void bch2_sb_counters_to_text(struct printbuf *out, struct bch_sb *sb,
-                             struct bch_sb_field *f)
-{
-       struct bch_sb_field_counters *ctrs = field_to_type(f, counters);
-       unsigned int i;
-       unsigned int nr = bch2_sb_counter_nr_entries(ctrs);
-
-       for (i = 0; i < nr; i++) {
-               if (i < BCH_COUNTER_NR)
-                       prt_printf(out, "%s ", bch2_counter_names[i]);
-               else
-                       prt_printf(out, "(unknown)");
-
-               prt_tab(out);
-               prt_printf(out, "%llu", le64_to_cpu(ctrs->d[i]));
-               prt_newline(out);
-       }
-};
-
-int bch2_sb_counters_to_cpu(struct bch_fs *c)
-{
-       struct bch_sb_field_counters *ctrs = bch2_sb_field_get(c->disk_sb.sb, counters);
-       unsigned int i;
-       unsigned int nr = bch2_sb_counter_nr_entries(ctrs);
-       u64 val = 0;
-
-       for (i = 0; i < BCH_COUNTER_NR; i++)
-               c->counters_on_mount[i] = 0;
-
-       for (i = 0; i < min_t(unsigned int, nr, BCH_COUNTER_NR); i++) {
-               val = le64_to_cpu(ctrs->d[i]);
-               percpu_u64_set(&c->counters[i], val);
-               c->counters_on_mount[i] = val;
-       }
-       return 0;
-};
-
-int bch2_sb_counters_from_cpu(struct bch_fs *c)
-{
-       struct bch_sb_field_counters *ctrs = bch2_sb_field_get(c->disk_sb.sb, counters);
-       struct bch_sb_field_counters *ret;
-       unsigned int i;
-       unsigned int nr = bch2_sb_counter_nr_entries(ctrs);
-
-       if (nr < BCH_COUNTER_NR) {
-               ret = bch2_sb_field_resize(&c->disk_sb, counters,
-                                              sizeof(*ctrs) / sizeof(u64) + BCH_COUNTER_NR);
-
-               if (ret) {
-                       ctrs = ret;
-                       nr = bch2_sb_counter_nr_entries(ctrs);
-               }
-       }
-
-
-       for (i = 0; i < min_t(unsigned int, nr, BCH_COUNTER_NR); i++)
-               ctrs->d[i] = cpu_to_le64(percpu_u64_get(&c->counters[i]));
-       return 0;
-}
-
-void bch2_fs_counters_exit(struct bch_fs *c)
-{
-       free_percpu(c->counters);
-}
-
-int bch2_fs_counters_init(struct bch_fs *c)
-{
-       c->counters = __alloc_percpu(sizeof(u64) * BCH_COUNTER_NR, sizeof(u64));
-       if (!c->counters)
-               return -BCH_ERR_ENOMEM_fs_counters_init;
-
-       return bch2_sb_counters_to_cpu(c);
-}
-
-const struct bch_sb_field_ops bch_sb_field_ops_counters = {
-       .validate       = bch2_sb_counters_validate,
-       .to_text        = bch2_sb_counters_to_text,
-};

diff --git a/fs/bcachefs/counters.h b/fs/bcachefs/counters.h
deleted file mode 100644 (file)
index 4778aa1..0000000
--- a/fs/bcachefs/counters.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef _BCACHEFS_COUNTERS_H
-#define _BCACHEFS_COUNTERS_H
-
-#include "bcachefs.h"
-#include "super-io.h"
-
-
-int bch2_sb_counters_to_cpu(struct bch_fs *);
-int bch2_sb_counters_from_cpu(struct bch_fs *);
-
-void bch2_fs_counters_exit(struct bch_fs *);
-int bch2_fs_counters_init(struct bch_fs *);
-
-extern const struct bch_sb_field_ops bch_sb_field_ops_counters;
-
-#endif // _BCACHEFS_COUNTERS_H

diff --git a/fs/bcachefs/sb-counters.c b/fs/bcachefs/sb-counters.c
new file mode 100644 (file)
index 0000000..7dc8987
--- /dev/null
+++ b/fs/bcachefs/sb-counters.c
@@ -0,0 +1,107 @@
+// SPDX-License-Identifier: GPL-2.0
+#include "bcachefs.h"
+#include "super-io.h"
+#include "sb-counters.h"
+
+/* BCH_SB_FIELD_counters */
+
+static const char * const bch2_counter_names[] = {
+#define x(t, n, ...) (#t),
+       BCH_PERSISTENT_COUNTERS()
+#undef x
+       NULL
+};
+
+static size_t bch2_sb_counter_nr_entries(struct bch_sb_field_counters *ctrs)
+{
+       if (!ctrs)
+               return 0;
+
+       return (__le64 *) vstruct_end(&ctrs->field) - &ctrs->d[0];
+};
+
+static int bch2_sb_counters_validate(struct bch_sb *sb,
+                                    struct bch_sb_field *f,
+                                    struct printbuf *err)
+{
+       return 0;
+};
+
+static void bch2_sb_counters_to_text(struct printbuf *out, struct bch_sb *sb,
+                             struct bch_sb_field *f)
+{
+       struct bch_sb_field_counters *ctrs = field_to_type(f, counters);
+       unsigned int i;
+       unsigned int nr = bch2_sb_counter_nr_entries(ctrs);
+
+       for (i = 0; i < nr; i++) {
+               if (i < BCH_COUNTER_NR)
+                       prt_printf(out, "%s ", bch2_counter_names[i]);
+               else
+                       prt_printf(out, "(unknown)");
+
+               prt_tab(out);
+               prt_printf(out, "%llu", le64_to_cpu(ctrs->d[i]));
+               prt_newline(out);
+       }
+};
+
+int bch2_sb_counters_to_cpu(struct bch_fs *c)
+{
+       struct bch_sb_field_counters *ctrs = bch2_sb_field_get(c->disk_sb.sb, counters);
+       unsigned int i;
+       unsigned int nr = bch2_sb_counter_nr_entries(ctrs);
+       u64 val = 0;
+
+       for (i = 0; i < BCH_COUNTER_NR; i++)
+               c->counters_on_mount[i] = 0;
+
+       for (i = 0; i < min_t(unsigned int, nr, BCH_COUNTER_NR); i++) {
+               val = le64_to_cpu(ctrs->d[i]);
+               percpu_u64_set(&c->counters[i], val);
+               c->counters_on_mount[i] = val;
+       }
+       return 0;
+};
+
+int bch2_sb_counters_from_cpu(struct bch_fs *c)
+{
+       struct bch_sb_field_counters *ctrs = bch2_sb_field_get(c->disk_sb.sb, counters);
+       struct bch_sb_field_counters *ret;
+       unsigned int i;
+       unsigned int nr = bch2_sb_counter_nr_entries(ctrs);
+
+       if (nr < BCH_COUNTER_NR) {
+               ret = bch2_sb_field_resize(&c->disk_sb, counters,
+                                              sizeof(*ctrs) / sizeof(u64) + BCH_COUNTER_NR);
+
+               if (ret) {
+                       ctrs = ret;
+                       nr = bch2_sb_counter_nr_entries(ctrs);
+               }
+       }
+
+
+       for (i = 0; i < min_t(unsigned int, nr, BCH_COUNTER_NR); i++)
+               ctrs->d[i] = cpu_to_le64(percpu_u64_get(&c->counters[i]));
+       return 0;
+}
+
+void bch2_fs_counters_exit(struct bch_fs *c)
+{
+       free_percpu(c->counters);
+}
+
+int bch2_fs_counters_init(struct bch_fs *c)
+{
+       c->counters = __alloc_percpu(sizeof(u64) * BCH_COUNTER_NR, sizeof(u64));
+       if (!c->counters)
+               return -BCH_ERR_ENOMEM_fs_counters_init;
+
+       return bch2_sb_counters_to_cpu(c);
+}
+
+const struct bch_sb_field_ops bch_sb_field_ops_counters = {
+       .validate       = bch2_sb_counters_validate,
+       .to_text        = bch2_sb_counters_to_text,
+};

diff --git a/fs/bcachefs/sb-counters.h b/fs/bcachefs/sb-counters.h
new file mode 100644 (file)
index 0000000..81f8aec
--- /dev/null
+++ b/fs/bcachefs/sb-counters.h
@@ -0,0 +1,16 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef _BCACHEFS_SB_COUNTERS_H
+#define _BCACHEFS_SB_COUNTERS_H
+
+#include "bcachefs.h"
+#include "super-io.h"
+
+int bch2_sb_counters_to_cpu(struct bch_fs *);
+int bch2_sb_counters_from_cpu(struct bch_fs *);
+
+void bch2_fs_counters_exit(struct bch_fs *);
+int bch2_fs_counters_init(struct bch_fs *);
+
+extern const struct bch_sb_field_ops bch_sb_field_ops_counters;
+
+#endif // _BCACHEFS_SB_COUNTERS_H

diff --git a/fs/bcachefs/super-io.c b/fs/bcachefs/super-io.c
index 9564d2d9ccaefaf2de89e3b09f66489d31f07f51..4e4da1a5e5d78d8c4e0b4811f23202bcb009a338 100644 (file)
--- a/fs/bcachefs/super-io.c
+++ b/fs/bcachefs/super-io.c
@@ -2,7 +2,6 @@
 
 #include "bcachefs.h"
 #include "checksum.h"
-#include "counters.h"
 #include "disk_groups.h"
 #include "ec.h"
 #include "error.h"
@@ -13,6 +12,7 @@
 #include "replicas.h"
 #include "quota.h"
 #include "sb-clean.h"
+#include "sb-counters.h"
 #include "sb-downgrade.h"
 #include "sb-errors.h"
 #include "sb-members.h"

diff --git a/fs/bcachefs/super.c b/fs/bcachefs/super.c
index 9262a9298fcd12c08e2194eb8024426b259d3ee9..670fe1e6733ad34d500617115db947fd9828629f 100644 (file)
--- a/fs/bcachefs/super.c
+++ b/fs/bcachefs/super.c
@@ -23,7 +23,6 @@
 #include "checksum.h"
 #include "clock.h"
 #include "compress.h"
-#include "counters.h"
 #include "debug.h"
 #include "disk_groups.h"
 #include "ec.h"
@@ -49,6 +48,7 @@
 #include "recovery.h"
 #include "replicas.h"
 #include "sb-clean.h"
+#include "sb-counters.h"
 #include "sb-errors.h"
 #include "sb-members.h"
 #include "snapshot.h"