Update bcachefs sources to 8c94740b1bf8 bcachefs: Add missing vaidation for jset_entr...

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

diff --git a/libbcachefs/bcachefs_format.h b/libbcachefs/bcachefs_format.h
index ad0f298c87c39e1420ad31b00a57b371b87af37d..967780072f69c18ad5be64cbee0a114e129a0c94 100644 (file)
--- a/libbcachefs/bcachefs_format.h
+++ b/libbcachefs/bcachefs_format.h
@@ -151,7 +151,11 @@ struct bpos {
 #else
 #error edit for your odd byteorder.
 #endif
-} __packed __aligned(4);
+} __packed
+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+__aligned(4)
+#endif
+;
 
 #define KEY_INODE_MAX                  ((__u64)~0ULL)
 #define KEY_OFFSET_MAX                 ((__u64)~0ULL)
@@ -2203,8 +2207,8 @@ struct jset_entry_dev_usage {
        __le32                  dev;
        __u32                   pad;
 
-       __le64                  buckets_ec;
-       __le64                  _buckets_unavailable; /* No longer used */
+       __le64                  _buckets_ec;            /* No longer used */
+       __le64                  _buckets_unavailable;   /* No longer used */
 
        struct jset_entry_dev_usage_type d[];
 };