bcachefs: improve bch2_dev_usage_to_text()

Add a line for capacity

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

diff --git a/fs/bcachefs/alloc_foreground.c b/fs/bcachefs/alloc_foreground.c
index 02de5ad2be2c93fc954ae23812d9e4ae2e3f423e..8563c2d268476e7f9f66457dfa62bbdb67747511 100644 (file)
--- a/fs/bcachefs/alloc_foreground.c
+++ b/fs/bcachefs/alloc_foreground.c
@@ -1740,7 +1740,7 @@ void bch2_dev_alloc_debug_to_text(struct printbuf *out, struct bch_dev *ca)
        printbuf_tabstop_push(out, 16);
        printbuf_tabstop_push(out, 16);
 
-       bch2_dev_usage_to_text(out, &stats);
+       bch2_dev_usage_to_text(out, ca, &stats);
 
        prt_newline(out);
 

diff --git a/fs/bcachefs/buckets.c b/fs/bcachefs/buckets.c
index 2650a0d246636959caf83b2f27445d47aec8094c..9f7004e941ce4185f87a573cd5570b0526d88e8d 100644 (file)
--- a/fs/bcachefs/buckets.c
+++ b/fs/bcachefs/buckets.c
@@ -71,17 +71,21 @@ bch2_fs_usage_read_short(struct bch_fs *c)
        return ret;
 }
 
-void bch2_dev_usage_to_text(struct printbuf *out, struct bch_dev_usage *usage)
+void bch2_dev_usage_to_text(struct printbuf *out,
+                           struct bch_dev *ca,
+                           struct bch_dev_usage *usage)
 {
        prt_printf(out, "\tbuckets\rsectors\rfragmented\r\n");
 
        for (unsigned i = 0; i < BCH_DATA_NR; i++) {
                bch2_prt_data_type(out, i);
                prt_printf(out, "\t%llu\r%llu\r%llu\r\n",
-                       usage->d[i].buckets,
-                       usage->d[i].sectors,
-                       usage->d[i].fragmented);
+                          usage->d[i].buckets,
+                          usage->d[i].sectors,
+                          usage->d[i].fragmented);
        }
+
+       prt_printf(out, "capacity\t%llu\r\n", ca->mi.nbuckets);
 }
 
 static int bch2_check_fix_ptr(struct btree_trans *trans,

diff --git a/fs/bcachefs/buckets.h b/fs/bcachefs/buckets.h
index 2d35eeb24a2d693e5117b2ebd11d0cf07a338490..edbdffd508fc3b0f1c78a47b33d554b043bc3ce7 100644 (file)
--- a/fs/bcachefs/buckets.h
+++ b/fs/bcachefs/buckets.h
@@ -212,7 +212,7 @@ static inline struct bch_dev_usage bch2_dev_usage_read(struct bch_dev *ca)
        return ret;
 }
 
-void bch2_dev_usage_to_text(struct printbuf *, struct bch_dev_usage *);
+void bch2_dev_usage_to_text(struct printbuf *, struct bch_dev *, struct bch_dev_usage *);
 
 static inline u64 bch2_dev_buckets_reserved(struct bch_dev *ca, enum bch_watermark watermark)
 {