diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-08-29 21:48:12 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-08-29 21:48:12 +0200 |
| commit | 9d6b14cd1e993d2ff98df0cef6d935ce6fd4dbec (patch) | |
| tree | 1bd218618157e8ab1ea26820e6bec718c4976f04 /fs/reiserfs | |
| parent | Merge tag 'csky-for-linus-6.6' of https://github.com/c-sky/csky-linux (diff) | |
| parent | fs: omfs: Use flexible-array member in struct omfs_extent (diff) | |
| download | linux-9d6b14cd1e993d2ff98df0cef6d935ce6fd4dbec.tar.xz linux-9d6b14cd1e993d2ff98df0cef6d935ce6fd4dbec.zip | |
Merge tag 'flex-array-transformations-6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux
Pull flexible-array updates from Gustavo A. R. Silva.
* tag 'flex-array-transformations-6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux:
fs: omfs: Use flexible-array member in struct omfs_extent
sparc: openpromio: Address -Warray-bounds warning
reiserfs: Replace one-element array with flexible-array member
Diffstat (limited to 'fs/reiserfs')
| -rw-r--r-- | fs/reiserfs/fix_node.c | 5 | ||||
| -rw-r--r-- | fs/reiserfs/reiserfs.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/fs/reiserfs/fix_node.c b/fs/reiserfs/fix_node.c index fefe87e1c099..6c13a8d9a73c 100644 --- a/fs/reiserfs/fix_node.c +++ b/fs/reiserfs/fix_node.c @@ -2252,8 +2252,9 @@ static int get_virtual_node_size(struct super_block *sb, struct buffer_head *bh) return sizeof(struct virtual_node) + max(max_num_of_items * sizeof(struct virtual_item), - sizeof(struct virtual_item) + sizeof(struct direntry_uarea) + - (max_num_of_entries - 1) * sizeof(__u16)); + sizeof(struct virtual_item) + + struct_size_t(struct direntry_uarea, entry_sizes, + max_num_of_entries)); } /* diff --git a/fs/reiserfs/reiserfs.h b/fs/reiserfs/reiserfs.h index 55e85256aae8..b81749492ef9 100644 --- a/fs/reiserfs/reiserfs.h +++ b/fs/reiserfs/reiserfs.h @@ -2373,7 +2373,7 @@ struct virtual_node { struct direntry_uarea { int flags; __u16 entry_count; - __u16 entry_sizes[1]; + __u16 entry_sizes[]; } __attribute__ ((__packed__)); /*************************************************************************** |