Commit 345731a3 authored by Kent Overstreet's avatar Kent Overstreet
Browse files

bcachefs: fix bch2_dev_usage_full_read_fast() 



One reference to bch_dev_usage wasn't updated, which meant we weren't
reading the full bch_dev_usage_full - oops.

Fixes: 955ba7b5 ("bcachefs: bch_dev_usage_full")
Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
parent 7dfd42a0

fs/bcachefs/buckets.c

+2 −1
Original line number Diff line number Diff line
@@ -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)

fs/bcachefs/buckets.h

+0 −5
Original line number Diff line number Diff line
@@ -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 *);