Commit cadf3223 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents f3cdc8ae 7aba5dcc

fs/jfs/jfs_dtree.c

+1 −1
Original line number Diff line number Diff line
@@ -2964,7 +2964,7 @@ struct jfs_dirent { 
	loff_t position;

	int ino;

	u16 name_len;

	char name[0];

	char name[];

};



/*

fs/jfs/jfs_xattr.h

+2 −2
Original line number Diff line number Diff line
@@ -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 */