Update bcachefs sources to 717b356d1d bcachefs: Convert journal validation to bkey_in...

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

diff --git a/libbcachefs/alloc_types.h b/libbcachefs/alloc_types.h
index 2e6f4806925871bf513f17235e6680e067e4471f..804a843f23c16ea4100baba6690d589ab98368e1 100644 (file)
--- a/libbcachefs/alloc_types.h
+++ b/libbcachefs/alloc_types.h
@@ -16,20 +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(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
+       BCH_WATERMARK_NR,
 };
 
+#define BCH_WATERMARK_BITS     3
+#define BCH_WATERMARK_MASK     ~(~0U << BCH_WATERMARK_BITS)
+
 #define OPEN_BUCKETS_COUNT     1024
 
 #define WRITE_POINT_HASH_NR    32
@@ -51,10 +55,9 @@ struct open_bucket {
         * the block in the stripe this open_bucket corresponds to:
         */
        u8                      ec_idx;
-       enum bch_data_type      data_type:8;
+       enum bch_data_type      data_type:6;
        unsigned                valid:1;
        unsigned                on_partial_list:1;
-       unsigned                alloc_reserve:3;
 
        u8                      dev;
        u8                      gen;