Update bcachefs sources to fd381c355c bcachefs: Fix a null ptr deref in fsck check_ex...

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

diff --git a/libbcachefs/bcachefs_format.h b/libbcachefs/bcachefs_format.h
index fdd0050c2707a608652207a0fd7060d138945568..7d1c0b1e3c54939d7f5fba2eb734e2059b3c176b 100644 (file)
--- a/libbcachefs/bcachefs_format.h
+++ b/libbcachefs/bcachefs_format.h
@@ -290,16 +290,8 @@ enum bch_bkey_fields {
 struct bkey_i {
        __u64                   _data[0];
 
-       union {
-       struct {
-               /* Size of combined key and value, in u64s */
-               __u8            u64s;
-       };
-       struct {
-               struct bkey     k;
-               struct bch_val  v;
-       };
-       };
+       struct bkey     k;
+       struct bch_val  v;
 };
 
 #define KEY(_inode, _offset, _size)                                    \
@@ -318,7 +310,7 @@ static inline void bkey_init(struct bkey *k)
 #define bkey_bytes(_k)         ((_k)->u64s * sizeof(__u64))
 
 #define __BKEY_PADDED(key, pad)                                        \
-       struct { struct bkey_i key; __u64 key ## _pad[pad]; }
+       struct bkey_i key; __u64 key ## _pad[pad]
 
 /*
  * - DELETED keys are used internally to mark keys that should be ignored but
@@ -1474,7 +1466,8 @@ struct bch_sb_field_disk_groups {
        x(transaction_commit,                           72)     \
        x(write_super,                                  73)     \
        x(trans_restart_would_deadlock_recursion_limit, 74)     \
-       x(trans_restart_write_buffer_flush,             75)
+       x(trans_restart_write_buffer_flush,             75)     \
+       x(trans_restart_split_race,                     76)
 
 enum bch_persistent_counters {
 #define x(t, n, ...) BCH_COUNTER_##t,
@@ -1561,7 +1554,8 @@ struct bch_sb_field_journal_seq_blacklist {
        x(unwritten_extents,            24)             \
        x(bucket_gens,                  25)             \
        x(lru_v2,                       26)             \
-       x(fragmentation_lru,            27)
+       x(fragmentation_lru,            27)             \
+       x(no_bps_in_alloc_keys,         28)
 
 enum bcachefs_metadata_version {
        bcachefs_metadata_version_min = 9,