Update bcachefs sources to 676dd269f0f8 mean and variance: Promote to lib/math

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

diff --git a/libbcachefs/vstructs.h b/libbcachefs/vstructs.h
index ce2cece0d0cb8672b9953659625a18410e80e973..a6561b4b36a6e15cf020a82ba2c6741659dbf757 100644 (file)
--- a/libbcachefs/vstructs.h
+++ b/libbcachefs/vstructs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _VSTRUCTS_H
 #define _VSTRUCTS_H
 
@@ -9,17 +10,17 @@
  */
 #define __vstruct_u64s(_s)                                             \
 ({                                                                     \
-       ( type_is((_s)->u64s, u64) ? le64_to_cpu((_s)->u64s)            \
-       : type_is((_s)->u64s, u32) ? le32_to_cpu((_s)->u64s)            \
-       : type_is((_s)->u64s, u16) ? le16_to_cpu((_s)->u64s)            \
-       : ((_s)->u64s));                                                \
+       ( type_is((_s)->u64s, u64) ? le64_to_cpu((__force __le64) (_s)->u64s)           \
+       : type_is((_s)->u64s, u32) ? le32_to_cpu((__force __le32) (_s)->u64s)           \
+       : type_is((_s)->u64s, u16) ? le16_to_cpu((__force __le16) (_s)->u64s)           \
+       : ((__force u8) ((_s)->u64s)));                                         \
 })
 
 #define __vstruct_bytes(_type, _u64s)                                  \
 ({                                                                     \
        BUILD_BUG_ON(offsetof(_type, _data) % sizeof(u64));             \
                                                                        \
-       (offsetof(_type, _data) + (_u64s) * sizeof(u64));               \
+       (size_t) (offsetof(_type, _data) + (_u64s) * sizeof(u64));      \
 })
 
 #define vstruct_bytes(_s)                                              \
@@ -40,11 +41,11 @@
        (round_up(vstruct_bytes(_s), 512 << (_sector_block_bits)) >> 9)
 
 #define vstruct_next(_s)                                               \
-       ((typeof(_s))                   ((_s)->_data + __vstruct_u64s(_s)))
+       ((typeof(_s))                   ((u64 *) (_s)->_data + __vstruct_u64s(_s)))
 #define vstruct_last(_s)                                               \
-       ((typeof(&(_s)->start[0]))      ((_s)->_data + __vstruct_u64s(_s)))
+       ((typeof(&(_s)->start[0]))      ((u64 *) (_s)->_data + __vstruct_u64s(_s)))
 #define vstruct_end(_s)                                                        \
-       ((void *)                       ((_s)->_data + __vstruct_u64s(_s)))
+       ((void *)                       ((u64 *) (_s)->_data + __vstruct_u64s(_s)))
 
 #define vstruct_for_each(_s, _i)                                       \
        for (_i = (_s)->start;                                          \