From 14117dcdfb3942d08f8c6446aae9df9f8d2e42db Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Fri, 22 Dec 2017 20:37:52 -0500 Subject: Update bcachefs sources to 2afdc642c2 bcachefs: kill bucket_data_type, improve disk usage stats --- libbcachefs/alloc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'libbcachefs/alloc.c') diff --git a/libbcachefs/alloc.c b/libbcachefs/alloc.c index 29799df6..4b6038db 100644 --- a/libbcachefs/alloc.c +++ b/libbcachefs/alloc.c @@ -109,7 +109,7 @@ static void pd_controllers_update(struct work_struct *work) u64 size = bucket_to_sector(ca, ca->mi.nbuckets - ca->mi.first_bucket) << 9; u64 dirty = bucket_to_sector(ca, - stats.buckets[S_DIRTY]) << 9; + stats.buckets[BCH_DATA_USER]) << 9; u64 free = bucket_to_sector(ca, __dev_buckets_free(ca, stats)) << 9; /* @@ -117,10 +117,10 @@ static void pd_controllers_update(struct work_struct *work) * reclaimed by copy GC */ s64 fragmented = (bucket_to_sector(ca, - stats.buckets[S_DIRTY] + - stats.buckets_cached) - - (stats.sectors[S_DIRTY] + - stats.sectors_cached)) << 9; + stats.buckets[BCH_DATA_USER] + + stats.buckets[BCH_DATA_CACHED]) - + (stats.sectors[BCH_DATA_USER] + + stats.sectors[BCH_DATA_CACHED])) << 9; fragmented = max(0LL, fragmented); -- cgit v1.2.3