Commit 472a2abb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'flex-array-transformations-6.3-rc1' of... 

Merge tag 'flex-array-transformations-6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux

Pull flexible-array updates from Gustavo Silva:
 "Transform zero-length arrays, in unions, into flexible arrays"

* tag 'flex-array-transformations-6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux:
  bcache: Replace zero-length arrays with DECLARE_FLEX_ARRAY() helper
  mm/memremap: Replace zero-length array with DECLARE_FLEX_ARRAY() helper
  exportfs: Replace zero-length array with DECLARE_FLEX_ARRAY() helper
parents e534a583 b942a520

drivers/md/bcache/bcache_ondisk.h

+4 −4
Original line number Diff line number Diff line
@@ -360,8 +360,8 @@ struct jset { 
	__u64			prio_bucket[MAX_CACHES_PER_SET];



	union {

		struct bkey	start[0];

		__u64		d[0];

		DECLARE_FLEX_ARRAY(struct bkey, start);

		DECLARE_FLEX_ARRAY(__u64, d);

	};

};
@@ -425,8 +425,8 @@ struct bset { 
	__u32			keys;



	union {

		struct bkey	start[0];

		__u64		d[0];

		DECLARE_FLEX_ARRAY(struct bkey, start);

		DECLARE_FLEX_ARRAY(__u64, d);

	};

};

include/linux/exportfs.h

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ struct fid { 
 			u32 parent_block;

 			u32 parent_generation;

 		} udf;

		__u32 raw[0];

		DECLARE_FLEX_ARRAY(__u32, raw);

	};

};

include/linux/memremap.h

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ struct dev_pagemap { 
	int nr_range;

	union {

		struct range range;

		struct range ranges[0];

		DECLARE_FLEX_ARRAY(struct range, ranges);

	};

};