btrfs: replace BUILD_BUG_ON by static_assert

[sfrench/cifs-2.6.git] / fs / btrfs / ctree.h

diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 54513c4e891a8226ae9d90c4ff23970e0f585685..89d2ed6c2eb1304aefe2e915c8e3cd09adfc3fac 100644 (file)
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -1639,25 +1639,25 @@ DECLARE_BTRFS_SETGET_BITS(64)
 static inline u##bits btrfs_##name(const struct extent_buffer *eb,     \
                                   const type *s)                       \
 {                                                                      \
-       BUILD_BUG_ON(sizeof(u##bits) != sizeof(((type *)0))->member);   \
+       static_assert(sizeof(u##bits) == sizeof(((type *)0))->member);  \
        return btrfs_get_##bits(eb, s, offsetof(type, member));         \
 }                                                                      \
 static inline void btrfs_set_##name(const struct extent_buffer *eb, type *s, \
                                    u##bits val)                        \
 {                                                                      \
-       BUILD_BUG_ON(sizeof(u##bits) != sizeof(((type *)0))->member);   \
+       static_assert(sizeof(u##bits) == sizeof(((type *)0))->member);  \
        btrfs_set_##bits(eb, s, offsetof(type, member), val);           \
 }                                                                      \
 static inline u##bits btrfs_token_##name(struct btrfs_map_token *token,        \
                                         const type *s)                 \
 {                                                                      \
-       BUILD_BUG_ON(sizeof(u##bits) != sizeof(((type *)0))->member);   \
+       static_assert(sizeof(u##bits) == sizeof(((type *)0))->member);  \
        return btrfs_get_token_##bits(token, s, offsetof(type, member));\
 }                                                                      \
 static inline void btrfs_set_token_##name(struct btrfs_map_token *token,\
                                          type *s, u##bits val)         \
 {                                                                      \
-       BUILD_BUG_ON(sizeof(u##bits) != sizeof(((type *)0))->member);   \
+       static_assert(sizeof(u##bits) == sizeof(((type *)0))->member);  \
        btrfs_set_token_##bits(token, s, offsetof(type, member), val);  \
 }
 
@@ -1688,8 +1688,8 @@ static inline void btrfs_set_##name(type *s, u##bits val)         \
 static inline u64 btrfs_device_total_bytes(const struct extent_buffer *eb,
                                           struct btrfs_dev_item *s)
 {
-       BUILD_BUG_ON(sizeof(u64) !=
-                    sizeof(((struct btrfs_dev_item *)0))->total_bytes);
+       static_assert(sizeof(u64) ==
+                     sizeof(((struct btrfs_dev_item *)0))->total_bytes);
        return btrfs_get_64(eb, s, offsetof(struct btrfs_dev_item,
                                            total_bytes));
 }
@@ -1697,8 +1697,8 @@ static inline void btrfs_set_device_total_bytes(const struct extent_buffer *eb,
                                                struct btrfs_dev_item *s,
                                                u64 val)
 {
-       BUILD_BUG_ON(sizeof(u64) !=
-                    sizeof(((struct btrfs_dev_item *)0))->total_bytes);
+       static_assert(sizeof(u64) ==
+                     sizeof(((struct btrfs_dev_item *)0))->total_bytes);
        WARN_ON(!IS_ALIGNED(val, eb->fs_info->sectorsize));
        btrfs_set_64(eb, s, offsetof(struct btrfs_dev_item, total_bytes), val);
 }