Update bcachefs sources to 25de2b00dc bcachefs: Change check for invalid key types

[bcachefs-tools-debian] / libbcachefs / alloc_types.h

diff --git a/libbcachefs/alloc_types.h b/libbcachefs/alloc_types.h
index a01fddfba004127d40ec40c9cb811a33fcc5e0c5..c33a29954e59a4f25f374f11a1003bed9c7dacfb 100644 (file)
--- a/libbcachefs/alloc_types.h
+++ b/libbcachefs/alloc_types.h
@@ -17,11 +17,12 @@ struct bucket_alloc_state {
 };
 
 #define BCH_WATERMARKS()               \
-       x(btree_copygc)                 \
-       x(btree)                        \
-       x(copygc)                       \
+       x(stripe)                       \
        x(normal)                       \
-       x(stripe)
+       x(copygc)                       \
+       x(btree)                        \
+       x(btree_copygc)                 \
+       x(reclaim)
 
 enum bch_watermark {
 #define x(name)        BCH_WATERMARK_##name,
@@ -30,6 +31,9 @@ enum bch_watermark {
        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