diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-02 20:11:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-02 20:11:35 -0700 |
| commit | cadf32234b6f6dd96a0892bf915e3ee8c438cf07 (patch) | |
| tree | 598776364251ceddaf9d111ca01d4aaf622d6c5c | |
| parent | f3cdc8ae116e27d84e1f33c7a2995960cebb73ac (diff) | |
| parent | 7aba5dcc234635b44b2781dbc268048cfba388ad (diff) | |
| download | linux-cadf32234b6f6dd96a0892bf915e3ee8c438cf07.tar.bz2 | |
Merge tag 'jfs-5.8' of git://github.com/kleikamp/linux-shaggy
Pull JFS update from David Kleikamp:
"Replace zero-length array in JFS"
* tag 'jfs-5.8' of git://github.com/kleikamp/linux-shaggy:
jfs: Replace zero-length array with flexible-array member
| -rw-r--r-- | fs/jfs/jfs_dtree.c | 2 | ||||
| -rw-r--r-- | fs/jfs/jfs_xattr.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/jfs/jfs_dtree.c b/fs/jfs/jfs_dtree.c index 3acc954f7c04..837d42f61464 100644 --- a/fs/jfs/jfs_dtree.c +++ b/fs/jfs/jfs_dtree.c @@ -2964,7 +2964,7 @@ struct jfs_dirent { loff_t position; int ino; u16 name_len; - char name[0]; + char name[]; }; /* diff --git a/fs/jfs/jfs_xattr.h b/fs/jfs/jfs_xattr.h index f0558b3348da..c50167a7bc50 100644 --- a/fs/jfs/jfs_xattr.h +++ b/fs/jfs/jfs_xattr.h @@ -17,12 +17,12 @@ struct jfs_ea { u8 flag; /* Unused? */ u8 namelen; /* Length of name */ __le16 valuelen; /* Length of value */ - char name[0]; /* Attribute name (includes null-terminator) */ + char name[]; /* Attribute name (includes null-terminator) */ }; /* Value immediately follows name */ struct jfs_ea_list { __le32 size; /* overall size */ - struct jfs_ea ea[0]; /* Variable length list */ + struct jfs_ea ea[]; /* Variable length list */ }; /* Macros for defining maxiumum number of bytes supported for EAs */ |