summaryrefslogtreecommitdiff
path: root/libbcachefs/buckets_types.h
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@gmail.com>2017-12-22 20:37:52 -0500
committerKent Overstreet <kent.overstreet@gmail.com>2017-12-23 00:51:17 -0500
commit14117dcdfb3942d08f8c6446aae9df9f8d2e42db (patch)
tree52943d664e2e820bc404da8860ae98cfe1830d8b /libbcachefs/buckets_types.h
parentda37a5f2043c9e7c90168eea88b326d40734567a (diff)
Update bcachefs sources to 2afdc642c2 bcachefs: kill bucket_data_type, improve disk usage stats
Diffstat (limited to 'libbcachefs/buckets_types.h')
-rw-r--r--libbcachefs/buckets_types.h28
1 files changed, 9 insertions, 19 deletions
diff --git a/libbcachefs/buckets_types.h b/libbcachefs/buckets_types.h
index 6f9b1226..8a3c8c30 100644
--- a/libbcachefs/buckets_types.h
+++ b/libbcachefs/buckets_types.h
@@ -3,14 +3,6 @@
#include "util.h"
-/* kill, switch to bch_data_type */
-enum bucket_data_type {
- BUCKET_DATA = 0,
- BUCKET_BTREE,
- BUCKET_JOURNAL,
- BUCKET_SB,
-};
-
struct bucket_mark {
union {
struct {
@@ -48,22 +40,20 @@ struct bucket {
};
};
-/* kill, switch to bucket_data_type */
-enum s_alloc {
- S_META,
- S_DIRTY,
- S_ALLOC_NR,
-};
-
struct bch_dev_usage {
- u64 buckets[S_ALLOC_NR];
- u64 buckets_cached;
+ u64 buckets[BCH_DATA_NR];
u64 buckets_alloc;
u64 buckets_unavailable;
/* _compressed_ sectors: */
- u64 sectors[S_ALLOC_NR];
- u64 sectors_cached;
+ u64 sectors[BCH_DATA_NR];
+};
+
+/* kill, switch to bch_data_type? */
+enum s_alloc {
+ S_META,
+ S_DIRTY,
+ S_ALLOC_NR,
};
struct bch_fs_usage {