Commit e609e386 authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by Chuck Lever
Browse files

NFSD: Avoid multiple -Wflex-array-member-not-at-end warnings 



Replace flexible-array member with a fixed-size array.

With this changes, fix many instances of the following type of
warnings:

fs/nfsd/nfsfh.h:79:33: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end]
fs/nfsd/state.h:763:33: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end]
fs/nfsd/state.h:669:33: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end]
fs/nfsd/state.h:549:33: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end]
fs/nfsd/xdr4.h:705:33: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end]
fs/nfsd/xdr4.h:678:33: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end]

Signed-off-by: default avatarGustavo A. R. Silva <gustavoars@kernel.org>
Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
Reviewed-by: default avatarNeilBrown <neil@brown.name>
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent 3f3503ad

fs/nfsd/nfsfh.h

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ struct knfsd_fh { 
			u8		fh_auth_type;	/* deprecated */

			u8		fh_fsid_type;

			u8		fh_fileid_type;

			u32		fh_fsid[]; /* flexible-array member */

			u32		fh_fsid[NFS4_FHSIZE / 4 - 1];

		};

	};

};