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

diff --git a/fs/jfs/jfs_dtree.c b/fs/jfs/jfs_dtree.c
index 3acc954f7c04b7de3ca52c1490853a4db8e87136..837d42f61464b3a7e06bd8cf625d8e1a96fbfd5e 100644 (file)
--- 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 f0558b3348dae850475e7fa3dc8996714e827d0c..c50167a7bc50c4b56adbc28ca85aaf52ed916456 100644 (file)
--- 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 */