X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libbcachefs%2Falloc_types.h;h=c33a29954e59a4f25f374f11a1003bed9c7dacfb;hb=ffa950ce1d59344ff621659b845416b8a526127f;hp=cd0c50aae41619a7b838f64b77a1355d94af7b70;hpb=9fc4b5d675cd6dc0b2503abe95b1c761d8d05abe;p=bcachefs-tools-debian

diff --git a/libbcachefs/alloc_types.h b/libbcachefs/alloc_types.h
index cd0c50a..c33a299 100644
--- a/libbcachefs/alloc_types.h
+++ b/libbcachefs/alloc_types.h
@@ -16,22 +16,24 @@ struct bucket_alloc_state {
 	u64	skipped_nouse;
 };
 
-struct ec_bucket_buf;
-
-#define BCH_ALLOC_RESERVES()		\
-	x(btree_movinggc)		\
+#define BCH_WATERMARKS()		\
+	x(stripe)			\
+	x(normal)			\
+	x(copygc)			\
 	x(btree)			\
-	x(movinggc)			\
-	x(none)				\
-	x(stripe)
+	x(btree_copygc)			\
+	x(reclaim)
 
-enum alloc_reserve {
-#define x(name)	RESERVE_##name,
-	BCH_ALLOC_RESERVES()
+enum bch_watermark {
+#define x(name)	BCH_WATERMARK_##name,
+	BCH_WATERMARKS()
 #undef x
-	RESERVE_NR,
+	BCH_WATERMARK_NR,
 };
 
+#define BCH_WATERMARK_BITS	3
+#define BCH_WATERMARK_MASK	~(~0 << BCH_WATERMARK_BITS)
+
 #define OPEN_BUCKETS_COUNT	1024
 
 #define WRITE_POINT_HASH_NR	32