summaryrefslogtreecommitdiff
path: root/fs/bcachefs/buckets.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/bcachefs/buckets.c')
-rw-r--r--fs/bcachefs/buckets.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/fs/bcachefs/buckets.c b/fs/bcachefs/buckets.c
index c0dac04253f7..73a96771316d 100644
--- a/fs/bcachefs/buckets.c
+++ b/fs/bcachefs/buckets.c
@@ -22,6 +22,7 @@
#include "replicas.h"
#include "subvolume.h"
#include "trace.h"
+#include "zone.h"
#include <linux/preempt.h>
@@ -66,9 +67,8 @@ void bch2_fs_usage_initialize(struct bch_fs *c)
for_each_member_device(c, ca) {
struct bch_dev_usage dev = bch2_dev_usage_read(ca);
- usage->hidden += (dev.d[BCH_DATA_sb].buckets +
- dev.d[BCH_DATA_journal].buckets) *
- ca->mi.bucket_size;
+ usage->hidden += dev.d[BCH_DATA_sb].sectors;
+ usage->hidden += dev.d[BCH_DATA_journal].sectors;
}
percpu_up_write(&c->mark_lock);
@@ -1743,7 +1743,8 @@ static int __bch2_trans_mark_dev_sb(struct btree_trans *trans,
for (i = 0; i < ca->journal.nr; i++) {
ret = bch2_trans_mark_metadata_bucket(trans, ca,
ca->journal.buckets[i],
- BCH_DATA_journal, ca->mi.bucket_size);
+ BCH_DATA_journal,
+ bucket_capacity(ca, ca->journal.buckets[i]));
if (ret)
return ret;
}