From ea83a3985d28372d56ec7cea6e73907551869f63 Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Wed, 13 Dec 2017 16:01:18 -0500 Subject: Update bcachefs sources to e57b5958cf bcachefs: fix for building in userspace --- libbcachefs/buckets_types.h | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'libbcachefs/buckets_types.h') diff --git a/libbcachefs/buckets_types.h b/libbcachefs/buckets_types.h index 63f1b27f..0bd8d2d8 100644 --- a/libbcachefs/buckets_types.h +++ b/libbcachefs/buckets_types.h @@ -59,6 +59,7 @@ struct bch_dev_usage { u64 buckets[S_ALLOC_NR]; u64 buckets_cached; u64 buckets_alloc; + u64 buckets_unavailable; /* _compressed_ sectors: */ u64 sectors[S_ALLOC_NR]; @@ -79,13 +80,6 @@ struct bch_fs_usage { u64 available_cache; }; -struct bucket_heap_entry { - size_t bucket; - struct bucket_mark mark; -}; - -typedef HEAP(struct bucket_heap_entry) bucket_heap; - /* * A reservation for space on disk: */ @@ -95,4 +89,11 @@ struct disk_reservation { unsigned nr_replicas; }; +struct copygc_heap_entry { + u64 offset; + struct bucket_mark mark; +}; + +typedef HEAP(struct copygc_heap_entry) copygc_heap; + #endif /* _BUCKETS_TYPES_H */ -- cgit v1.2.3