diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2023-01-13 13:48:40 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2023-01-13 13:48:40 +1100 |
| commit | 818a7ee99324cefeb9e95de1cec37747261cbec4 (patch) | |
| tree | 2d5457db533a71aaf7adef8f754de05126c586cd | |
| parent | f8717dcd87ac48c66d9e6a399a08bc2d725bd9c2 (diff) | |
| parent | b942a520d9e43bc31f0808d2f2267a1ddba75518 (diff) | |
Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git
| -rw-r--r-- | drivers/md/bcache/bcache_ondisk.h | 8 | ||||
| -rw-r--r-- | include/linux/exportfs.h | 2 | ||||
| -rw-r--r-- | include/linux/memremap.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/drivers/md/bcache/bcache_ondisk.h b/drivers/md/bcache/bcache_ondisk.h index 97413586195b..d086a0ce4bc2 100644 --- a/drivers/md/bcache/bcache_ondisk.h +++ b/drivers/md/bcache/bcache_ondisk.h @@ -359,8 +359,8 @@ struct jset { __u64 prio_bucket[MAX_CACHES_PER_SET]; union { - struct bkey start[0]; - __u64 d[0]; + DECLARE_FLEX_ARRAY(struct bkey, start); + DECLARE_FLEX_ARRAY(__u64, d); }; }; @@ -424,8 +424,8 @@ struct bset { __u32 keys; union { - struct bkey start[0]; - __u64 d[0]; + DECLARE_FLEX_ARRAY(struct bkey, start); + DECLARE_FLEX_ARRAY(__u64, d); }; }; diff --git a/include/linux/exportfs.h b/include/linux/exportfs.h index 9f4d4bcbf251..601700fedc91 100644 --- a/include/linux/exportfs.h +++ b/include/linux/exportfs.h @@ -131,7 +131,7 @@ struct fid { u32 parent_block; u32 parent_generation; } udf; - __u32 raw[0]; + DECLARE_FLEX_ARRAY(__u32, raw); }; }; diff --git a/include/linux/memremap.h b/include/linux/memremap.h index 7fcaf3180a5b..1314d9c5f05b 100644 --- a/include/linux/memremap.h +++ b/include/linux/memremap.h @@ -135,7 +135,7 @@ struct dev_pagemap { int nr_range; union { struct range range; - struct range ranges[0]; + DECLARE_FLEX_ARRAY(struct range, ranges); }; }; |