X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libbcachefs%2Fbuckets_types.h;h=e79a33795bf936144675bda12f2659f5b49c90aa;hb=790ca9522a96efe321aae36fb0d7f4e437110b0f;hp=6f9b12265df3f2f92416289c64492fb218130730;hpb=1cf4d51dc4661f336f5318c176a3561ddf5bf04f;p=bcachefs-tools-debian

diff --git a/libbcachefs/buckets_types.h b/libbcachefs/buckets_types.h
index 6f9b122..e79a337 100644
--- a/libbcachefs/buckets_types.h
+++ b/libbcachefs/buckets_types.h
@@ -1,95 +1,102 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _BUCKETS_TYPES_H
 #define _BUCKETS_TYPES_H
 
+#include "bcachefs_format.h"
 #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 {
-		u64		counter;
-	};
-
-	struct {
-		u8		gen;
-		u8		data_type:3,
-				gen_valid:1,
-				owned_by_allocator:1,
-				nouse:1,
-				journal_seq_valid:1,
-				touched_this_mount:1;
-		u16		dirty_sectors;
-		u16		cached_sectors;
-
-		/*
-		 * low bits of journal sequence number when this bucket was most
-		 * recently modified: if journal_seq_valid is set, this bucket
-		 * can't be reused until the journal sequence number written to
-		 * disk is >= the bucket's journal sequence number:
-		 */
-		u16		journal_seq;
-	};
-	};
-};
+#define BUCKET_JOURNAL_SEQ_BITS		16
 
 struct bucket {
-	u16				prio[2];
+	u8			lock;
+	u8			gen_valid:1;
+	u8			data_type:7;
+	u8			gen;
+	u8			stripe_redundancy;
+	u32			stripe;
+	u32			dirty_sectors;
+	u32			cached_sectors;
+};
 
-	union {
-		struct bucket_mark	_mark;
-		const struct bucket_mark mark;
-	};
+struct bucket_array {
+	struct rcu_head		rcu;
+	u16			first_bucket;
+	size_t			nbuckets;
+	struct bucket		b[];
 };
 
-/* kill, switch to bucket_data_type */
-enum s_alloc {
-	S_META,
-	S_DIRTY,
-	S_ALLOC_NR,
+struct bucket_gens {
+	struct rcu_head		rcu;
+	u16			first_bucket;
+	size_t			nbuckets;
+	u8			b[];
 };
 
 struct bch_dev_usage {
-	u64			buckets[S_ALLOC_NR];
-	u64			buckets_cached;
-	u64			buckets_alloc;
+	u64			buckets_ec;
 	u64			buckets_unavailable;
 
-	/* _compressed_ sectors: */
-	u64			sectors[S_ALLOC_NR];
-	u64			sectors_cached;
+	struct {
+		u64		buckets;
+		u64		sectors; /* _compressed_ sectors: */
+		/*
+		 * XXX
+		 * Why do we have this? Isn't it just buckets * bucket_size -
+		 * sectors?
+		 */
+		u64		fragmented;
+	}			d[BCH_DATA_NR];
 };
 
 struct bch_fs_usage {
 	/* all fields are in units of 512 byte sectors: */
-	/* _uncompressed_ sectors: */
+	u64			hidden;
+	u64			btree;
+	u64			data;
+	u64			cached;
+	u64			reserved;
+	u64			nr_inodes;
+
+	/* XXX: add stats for compression ratio */
+#if 0
+	u64			uncompressed;
+	u64			compressed;
+#endif
+
+	/* broken out: */
+
+	u64			persistent_reserved[BCH_REPLICAS_MAX];
+	u64			replicas[];
+};
+
+struct bch_fs_usage_online {
 	u64			online_reserved;
-	u64			available_cache;
+	struct bch_fs_usage	u;
+};
 
-	struct {
-		u64		data[S_ALLOC_NR];
-		u64		persistent_reserved;
-	}			s[BCH_REPLICAS_MAX];
+struct bch_fs_usage_short {
+	u64			capacity;
+	u64			used;
+	u64			free;
+	u64			nr_inodes;
 };
 
 /*
  * A reservation for space on disk:
  */
 struct disk_reservation {
-	u64		sectors;
-	u32		gen;
-	unsigned	nr_replicas;
+	u64			sectors;
+	u32			gen;
+	unsigned		nr_replicas;
 };
 
 struct copygc_heap_entry {
+	u8			dev;
+	u8			gen;
+	u8			replicas;
+	u32			fragmentation;
+	u32			sectors;
 	u64			offset;
-	struct bucket_mark	mark;
 };
 
 typedef HEAP(struct copygc_heap_entry) copygc_heap;