Update bcachefs sources to fb39031ade bcachefs: bch2_sb_maybe_downgrade(), bch2_sb_up...

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

diff --git a/libbcachefs/counters.c b/libbcachefs/counters.c
index 745f856e6d3e9b351a4eef7c6038a542c1dc330c..442a9b806a3c164d5ae4209ea4494d45ee815230 100644 (file)
--- a/libbcachefs/counters.c
+++ b/libbcachefs/counters.c
@@ -5,7 +5,7 @@
 
 /* BCH_SB_FIELD_counters */
 
-const char * const bch2_counter_names[] = {
+static const char * const bch2_counter_names[] = {
 #define x(t, n, ...) (#t),
        BCH_PERSISTENT_COUNTERS()
 #undef x
@@ -27,7 +27,7 @@ static int bch2_sb_counters_validate(struct bch_sb *sb,
        return 0;
 };
 
-void bch2_sb_counters_to_text(struct printbuf *out, struct bch_sb *sb,
+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);
@@ -36,7 +36,7 @@ void bch2_sb_counters_to_text(struct printbuf *out, struct bch_sb *sb,
 
        for (i = 0; i < nr; i++) {
                if (i < BCH_COUNTER_NR)
-                       prt_printf(out, "%s", bch2_counter_names[i]);
+                       prt_printf(out, "%s ", bch2_counter_names[i]);
                else
                        prt_printf(out, "(unknown)");
 
@@ -96,7 +96,7 @@ int bch2_fs_counters_init(struct bch_fs *c)
 {
        c->counters = __alloc_percpu(sizeof(u64) * BCH_COUNTER_NR, sizeof(u64));
        if (!c->counters)
-               return -ENOMEM;
+               return -BCH_ERR_ENOMEM_fs_counters_init;
 
        return bch2_sb_counters_to_cpu(c);
 }