bcachefs: fix bch2_dev_usage_full_read_fast()

Kent Overstreet · Kent Overstreet · commit 345731a389fa · 2025-04-13T14:54:34.000-04:00
One reference to bch_dev_usage wasn't updated, which meant we weren't reading the full bch_dev_usage_full - oops. Fixes: 955ba7b ("bcachefs: bch_dev_usage_full") Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
diff --git a/fs/bcachefs/buckets.c b/fs/bcachefs/buckets.c
@@ -37,7 +37,8 @@ void bch2_dev_usage_read_fast(struct bch_dev *ca, struct bch_dev_usage *usage)
 void bch2_dev_usage_full_read_fast(struct bch_dev *ca, struct bch_dev_usage_full *usage)
 {
 	memset(usage, 0, sizeof(*usage));
-	acc_u64s_percpu((u64 *) usage, (u64 __percpu *) ca->usage, dev_usage_u64s());
+	acc_u64s_percpu((u64 *) usage, (u64 __percpu *) ca->usage,
+			sizeof(struct bch_dev_usage_full) / sizeof(u64));
 }
 
 static u64 reserve_factor(u64 r)
diff --git a/fs/bcachefs/buckets.h b/fs/bcachefs/buckets.h
@@ -242,11 +242,6 @@ static inline u64 dev_buckets_available(struct bch_dev *ca,
 
 /* Filesystem usage: */
 
-static inline unsigned dev_usage_u64s(void)
-{
-	return sizeof(struct bch_dev_usage) / sizeof(u64);
-}
-
 struct bch_fs_usage_short
 bch2_fs_usage_read_short(struct bch_fs *);
 

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,8 @@ void bch2_dev_usage_read_fast(struct bch_dev ca, struct bch_dev_usage usage)`
`37`	`37`	`void bch2_dev_usage_full_read_fast(struct bch_dev ca, struct bch_dev_usage_full usage)`
`38`	`38`	`{`
`39`	`39`	`memset(usage, 0, sizeof(*usage));`
`40`		`- acc_u64s_percpu((u64 ) usage, (u64 __percpu ) ca->usage, dev_usage_u64s());`
	`40`	`+ acc_u64s_percpu((u64 ) usage, (u64 __percpu ) ca->usage,`
	`41`	`+ sizeof(struct bch_dev_usage_full) / sizeof(u64));`
`41`	`42`	`}`
`42`	`43`
`43`	`44`	`static u64 reserve_factor(u64 r)`