Skip to content

Commit cadf322

Browse files
committed
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
2 parents f3cdc8a + 7aba5dc commit cadf322

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

fs/jfs/jfs_dtree.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2964,7 +2964,7 @@ struct jfs_dirent {
29642964
loff_t position;
29652965
int ino;
29662966
u16 name_len;
2967-
char name[0];
2967+
char name[];
29682968
};
29692969

29702970
/*

fs/jfs/jfs_xattr.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ struct jfs_ea {
1717
u8 flag; /* Unused? */
1818
u8 namelen; /* Length of name */
1919
__le16 valuelen; /* Length of value */
20-
char name[0]; /* Attribute name (includes null-terminator) */
20+
char name[]; /* Attribute name (includes null-terminator) */
2121
}; /* Value immediately follows name */
2222

2323
struct jfs_ea_list {
2424
__le32 size; /* overall size */
25-
struct jfs_ea ea[0]; /* Variable length list */
25+
struct jfs_ea ea[]; /* Variable length list */
2626
};
2727

2828
/* Macros for defining maxiumum number of bytes supported for EAs */

0 commit comments

Comments
 (0)