bcachefs: improve bch2_dev_usage_to_text()

Kent Overstreet · Kent Overstreet · commit 1a9e219db15e · 2024-08-09T14:40:19.000-04:00
Add a line for capacity

Signed-off-by: Kent Overstreet &lt;kent.overstreet@linux.dev&gt;
diff --git 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
@@ -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
@@ -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)
 {

Original file line number	Diff line number	Diff line change
`@@ -71,17 +71,21 @@ bch2_fs_usage_read_short(struct bch_fs *c)`
`71`	`71`	`return ret;`
`72`	`72`	`}`
`73`	`73`
`74`		`-void bch2_dev_usage_to_text(struct printbuf out, struct bch_dev_usage usage)`
	`74`	`+void bch2_dev_usage_to_text(struct printbuf *out,`
	`75`	`+ struct bch_dev *ca,`
	`76`	`+ struct bch_dev_usage *usage)`
`75`	`77`	`{`
`76`	`78`	`prt_printf(out, "\tbuckets\rsectors\rfragmented\r\n");`
`77`	`79`
`78`	`80`	`for (unsigned i = 0; i < BCH_DATA_NR; i++) {`
`79`	`81`	`bch2_prt_data_type(out, i);`
`80`	`82`	`prt_printf(out, "\t%llu\r%llu\r%llu\r\n",`
`81`		`- usage->d[i].buckets,`
`82`		`- usage->d[i].sectors,`
`83`		`- usage->d[i].fragmented);`
	`83`	`+ usage->d[i].buckets,`
	`84`	`+ usage->d[i].sectors,`
	`85`	`+ usage->d[i].fragmented);`
`84`	`86`	`}`
	`87`	`+`
	`88`	`+ prt_printf(out, "capacity\t%llu\r\n", ca->mi.nbuckets);`
`85`	`89`	`}`
`86`	`90`
`87`	`91`	`static int bch2_check_fix_ptr(struct btree_trans *trans,`
Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@ static inline struct bch_dev_usage bch2_dev_usage_read(struct bch_dev *ca)`
`212`	`212`	`return ret;`
`213`	`213`	`}`
`214`	`214`
`215`		`-void bch2_dev_usage_to_text(struct printbuf , struct bch_dev_usage );`
	`215`	`+void bch2_dev_usage_to_text(struct printbuf , struct bch_dev , struct bch_dev_usage *);`
`216`	`216`
`217`	`217`	`static inline u64 bch2_dev_buckets_reserved(struct bch_dev *ca, enum bch_watermark watermark)`
`218`	`218`	`{`