Update bcachefs sources to 75e8a078b8 bcachefs: improved flush_held_btree_writes()

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

diff --git a/libbcachefs/bcachefs_format.h b/libbcachefs/bcachefs_format.h
index d020cf74e9e975f8ee88f04652e011aeb1df7c38..56bf69eb66d45cd34616832f3a700f575574cdd6 100644 (file)
--- a/libbcachefs/bcachefs_format.h
+++ b/libbcachefs/bcachefs_format.h
@@ -821,11 +821,12 @@ struct bch_alloc {
 } __attribute__((packed, aligned(8)));
 
 #define BCH_ALLOC_FIELDS()                     \
-       x(read_time, 2)                         \
-       x(write_time, 2)                        \
-       x(data_type, 1)                         \
-       x(dirty_sectors, 2)                     \
-       x(cached_sectors, 2)
+       x(read_time,            16)             \
+       x(write_time,           16)             \
+       x(data_type,            8)              \
+       x(dirty_sectors,        16)             \
+       x(cached_sectors,       16)             \
+       x(oldest_gen,           8)
 
 enum {
 #define x(name, bytes) BCH_ALLOC_FIELD_##name,
@@ -835,12 +836,12 @@ enum {
 };
 
 static const unsigned BCH_ALLOC_FIELD_BYTES[] = {
-#define x(name, bytes) [BCH_ALLOC_FIELD_##name] = bytes,
+#define x(name, bits) [BCH_ALLOC_FIELD_##name] = bits / 8,
        BCH_ALLOC_FIELDS()
 #undef x
 };
 
-#define x(name, bytes) + bytes
+#define x(name, bits) + (bits / 8)
 static const unsigned BKEY_ALLOC_VAL_U64s_MAX =
        DIV_ROUND_UP(offsetof(struct bch_alloc, data)
                     BCH_ALLOC_FIELDS(), sizeof(u64));