Update bcachefs sources to 1ff261b014 bcachefs: Fix CPU usage in journal read path

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

diff --git a/libbcachefs/alloc_types.h b/libbcachefs/alloc_types.h
index 4a1cd8b73d16b1e500a84ae9290d9bf144c502cf..e078584d46f6562372bccc0303ed71109cb3bcee 100644 (file)
--- a/libbcachefs/alloc_types.h
+++ b/libbcachefs/alloc_types.h
@@ -10,51 +10,48 @@
 
 struct ec_bucket_buf;
 
-#define ALLOC_THREAD_STATES()          \
-       x(stopped)                      \
-       x(running)                      \
-       x(blocked)                      \
-       x(blocked_full)
-
-enum allocator_states {
-#define x(n)   ALLOCATOR_##n,
-       ALLOC_THREAD_STATES()
-#undef x
-};
+#define BCH_ALLOC_RESERVES()           \
+       x(btree_movinggc)               \
+       x(btree)                        \
+       x(movinggc)                     \
+       x(none)
 
 enum alloc_reserve {
-       RESERVE_BTREE_MOVINGGC  = -2,
-       RESERVE_BTREE           = -1,
-       RESERVE_MOVINGGC        = 0,
-       RESERVE_NONE            = 1,
-       RESERVE_NR              = 2,
+#define x(name)        RESERVE_##name,
+       BCH_ALLOC_RESERVES()
+#undef x
 };
 
-typedef FIFO(long)     alloc_fifo;
-
 #define OPEN_BUCKETS_COUNT     1024
 
 #define WRITE_POINT_HASH_NR    32
 #define WRITE_POINT_MAX                32
 
+/*
+ * 0 is never a valid open_bucket_idx_t:
+ */
 typedef u16                    open_bucket_idx_t;
 
 struct open_bucket {
        spinlock_t              lock;
        atomic_t                pin;
        open_bucket_idx_t       freelist;
+       open_bucket_idx_t       hash;
 
        /*
         * When an open bucket has an ec_stripe attached, this is the index of
         * the block in the stripe this open_bucket corresponds to:
         */
        u8                      ec_idx;
-       u8                      type;
+       enum bch_data_type      data_type:8;
        unsigned                valid:1;
        unsigned                on_partial_list:1;
-       int                     alloc_reserve:3;
-       unsigned                sectors_free;
-       struct bch_extent_ptr   ptr;
+       unsigned                alloc_reserve:3;
+
+       u8                      dev;
+       u8                      gen;
+       u32                     sectors_free;
+       u64                     bucket;
        struct ec_stripe_new    *ec;
 };
 
@@ -74,7 +71,7 @@ struct write_point {
        struct mutex            lock;
        u64                     last_used;
        unsigned long           write_point;
-       enum bch_data_type      type;
+       enum bch_data_type      data_type;
 
        /* calculated based on how many pointers we're actually going to use: */
        unsigned                sectors_free;
@@ -87,12 +84,4 @@ struct write_point_specifier {
        unsigned long           v;
 };
 
-struct alloc_heap_entry {
-       size_t                  bucket;
-       size_t                  nr;
-       unsigned long           key;
-};
-
-typedef HEAP(struct alloc_heap_entry) alloc_heap;
-
 #endif /* _BCACHEFS_ALLOC_TYPES_H */