rust: Fix ptr casting in Fs::open()

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

diff --git a/libbcachefs/counters.c b/libbcachefs/counters.c
index 25a6b38b18b52f7dbffb42274027d40e87878551..edd1b2537f482991c48d0c67b60f1a3d9a857667 100644 (file)
--- a/libbcachefs/counters.c
+++ b/libbcachefs/counters.c
@@ -36,13 +36,13 @@ void bch2_sb_counters_to_text(struct printbuf *out, struct bch_sb *sb,
 
        for (i = 0; i < nr; i++) {
                if (i < BCH_COUNTER_NR)
-                       pr_buf(out, "%s", bch2_counter_names[i]);
+                       prt_printf(out, "%s ", bch2_counter_names[i]);
                else
-                       pr_buf(out, "(unknown)");
+                       prt_printf(out, "(unknown)");
 
-               pr_tab(out);
-               pr_buf(out, "%llu", le64_to_cpu(ctrs->d[i]));
-               pr_newline(out);
+               prt_tab(out);
+               prt_printf(out, "%llu", le64_to_cpu(ctrs->d[i]));
+               prt_newline(out);
        };
 };
 
@@ -87,18 +87,18 @@ int bch2_sb_counters_from_cpu(struct bch_fs *c)
        return 0;
 }
 
-int bch2_fs_counters_init(struct bch_fs *c)
+void bch2_fs_counters_exit(struct bch_fs *c)
 {
-       int ret = 0;
+       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 -ENOMEM;
 
-       ret = bch2_sb_counters_to_cpu(c);
-
-       return ret;
+       return bch2_sb_counters_to_cpu(c);
 }
 
 const struct bch_sb_field_ops bch_sb_field_ops_counters = {