bcachefs: Move tabstop setup to bch2_dev_usage_to_text()

No reason for it not to be where it's needed.

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

diff --git a/fs/bcachefs/alloc_foreground.c b/fs/bcachefs/alloc_foreground.c
index bf8fb9cd650bb71eb6f28b77ff68bd03d96fba38..d0e0b56892e39f86fc00a1936cf3864d110e94eb 100644 (file)
--- a/fs/bcachefs/alloc_foreground.c
+++ b/fs/bcachefs/alloc_foreground.c
@@ -1729,13 +1729,6 @@ void bch2_dev_alloc_debug_to_text(struct printbuf *out, struct bch_dev *ca)
        for (unsigned i = 0; i < ARRAY_SIZE(c->open_buckets); i++)
                nr[c->open_buckets[i].data_type]++;
 
-       printbuf_tabstops_reset(out);
-       printbuf_tabstop_push(out, 12);
-       printbuf_tabstop_push(out, 16);
-       printbuf_tabstop_push(out, 16);
-       printbuf_tabstop_push(out, 16);
-       printbuf_tabstop_push(out, 16);
-
        bch2_dev_usage_to_text(out, ca, &stats);
 
        prt_newline(out);

diff --git a/fs/bcachefs/buckets.c b/fs/bcachefs/buckets.c
index 4a0f55dc78c4e7281f97016efd4ce7812c4279e6..4abd22d7e3f84b692d077de41461fdfc239e5c21 100644 (file)
--- a/fs/bcachefs/buckets.c
+++ b/fs/bcachefs/buckets.c
@@ -75,6 +75,15 @@ void bch2_dev_usage_to_text(struct printbuf *out,
                            struct bch_dev *ca,
                            struct bch_dev_usage *usage)
 {
+       if (out->nr_tabstops < 5) {
+               printbuf_tabstops_reset(out);
+               printbuf_tabstop_push(out, 12);
+               printbuf_tabstop_push(out, 16);
+               printbuf_tabstop_push(out, 16);
+               printbuf_tabstop_push(out, 16);
+               printbuf_tabstop_push(out, 16);
+       }
+
        prt_printf(out, "\tbuckets\rsectors\rfragmented\r\n");
 
        for (unsigned i = 0; i < BCH_DATA_NR; i++) {