Commit ad1060c8 authored by J. Bruce Fields's avatar J. Bruce Fields
Browse files

nfsd: Use C99 initializers in fs/nfsd/nfs4xdr.c 



Thanks to problem report and original patch from Harvey Harrison.

Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
Cc: Harvey Harrison <harvey.harrison@gmail.com>
Cc: Benny Halevy <bhalevy@panasas.com>
parent 367c8c7b

fs/nfsd/nfs4xdr.c

+74 −74
Original line number Diff line number Diff line
@@ -1000,43 +1000,43 @@ nfsd4_decode_notsupp(struct nfsd4_compoundargs *argp, void *p) 
typedef __be32(*nfsd4_dec)(struct nfsd4_compoundargs *argp, void *);



static nfsd4_dec nfsd4_dec_ops[] = {

	[OP_ACCESS]		(nfsd4_dec)nfsd4_decode_access,

	[OP_CLOSE]		(nfsd4_dec)nfsd4_decode_close,

	[OP_COMMIT]		(nfsd4_dec)nfsd4_decode_commit,

	[OP_CREATE]		(nfsd4_dec)nfsd4_decode_create,

	[OP_DELEGPURGE]		(nfsd4_dec)nfsd4_decode_notsupp,

	[OP_DELEGRETURN]	(nfsd4_dec)nfsd4_decode_delegreturn,

	[OP_GETATTR]		(nfsd4_dec)nfsd4_decode_getattr,

	[OP_GETFH]		(nfsd4_dec)nfsd4_decode_noop,

	[OP_LINK]		(nfsd4_dec)nfsd4_decode_link,

	[OP_LOCK]		(nfsd4_dec)nfsd4_decode_lock,

	[OP_LOCKT]		(nfsd4_dec)nfsd4_decode_lockt,

	[OP_LOCKU]		(nfsd4_dec)nfsd4_decode_locku,

	[OP_LOOKUP]		(nfsd4_dec)nfsd4_decode_lookup,

	[OP_LOOKUPP]		(nfsd4_dec)nfsd4_decode_noop,

	[OP_NVERIFY]		(nfsd4_dec)nfsd4_decode_verify,

	[OP_OPEN]		(nfsd4_dec)nfsd4_decode_open,

	[OP_OPENATTR]		(nfsd4_dec)nfsd4_decode_notsupp,

	[OP_OPEN_CONFIRM]	(nfsd4_dec)nfsd4_decode_open_confirm,

	[OP_OPEN_DOWNGRADE]	(nfsd4_dec)nfsd4_decode_open_downgrade,

	[OP_PUTFH]		(nfsd4_dec)nfsd4_decode_putfh,

	[OP_PUTPUBFH]		(nfsd4_dec)nfsd4_decode_notsupp,

	[OP_PUTROOTFH]		(nfsd4_dec)nfsd4_decode_noop,

	[OP_READ]		(nfsd4_dec)nfsd4_decode_read,

	[OP_READDIR]		(nfsd4_dec)nfsd4_decode_readdir,

	[OP_READLINK]		(nfsd4_dec)nfsd4_decode_noop,

	[OP_REMOVE]		(nfsd4_dec)nfsd4_decode_remove,

	[OP_RENAME]		(nfsd4_dec)nfsd4_decode_rename,

	[OP_RENEW]		(nfsd4_dec)nfsd4_decode_renew,

	[OP_RESTOREFH]		(nfsd4_dec)nfsd4_decode_noop,

	[OP_SAVEFH]		(nfsd4_dec)nfsd4_decode_noop,

	[OP_SECINFO]		(nfsd4_dec)nfsd4_decode_secinfo,

	[OP_SETATTR]		(nfsd4_dec)nfsd4_decode_setattr,

	[OP_SETCLIENTID]	(nfsd4_dec)nfsd4_decode_setclientid,

	[OP_SETCLIENTID_CONFIRM](nfsd4_dec)nfsd4_decode_setclientid_confirm,

	[OP_VERIFY]		(nfsd4_dec)nfsd4_decode_verify,

	[OP_WRITE]		(nfsd4_dec)nfsd4_decode_write,

	[OP_RELEASE_LOCKOWNER]	(nfsd4_dec)nfsd4_decode_release_lockowner,

	[OP_ACCESS]		= (nfsd4_dec)nfsd4_decode_access,

	[OP_CLOSE]		= (nfsd4_dec)nfsd4_decode_close,

	[OP_COMMIT]		= (nfsd4_dec)nfsd4_decode_commit,

	[OP_CREATE]		= (nfsd4_dec)nfsd4_decode_create,

	[OP_DELEGPURGE]		= (nfsd4_dec)nfsd4_decode_notsupp,

	[OP_DELEGRETURN]	= (nfsd4_dec)nfsd4_decode_delegreturn,

	[OP_GETATTR]		= (nfsd4_dec)nfsd4_decode_getattr,

	[OP_GETFH]		= (nfsd4_dec)nfsd4_decode_noop,

	[OP_LINK]		= (nfsd4_dec)nfsd4_decode_link,

	[OP_LOCK]		= (nfsd4_dec)nfsd4_decode_lock,

	[OP_LOCKT]		= (nfsd4_dec)nfsd4_decode_lockt,

	[OP_LOCKU]		= (nfsd4_dec)nfsd4_decode_locku,

	[OP_LOOKUP]		= (nfsd4_dec)nfsd4_decode_lookup,

	[OP_LOOKUPP]		= (nfsd4_dec)nfsd4_decode_noop,

	[OP_NVERIFY]		= (nfsd4_dec)nfsd4_decode_verify,

	[OP_OPEN]		= (nfsd4_dec)nfsd4_decode_open,

	[OP_OPENATTR]		= (nfsd4_dec)nfsd4_decode_notsupp,

	[OP_OPEN_CONFIRM]	= (nfsd4_dec)nfsd4_decode_open_confirm,

	[OP_OPEN_DOWNGRADE]	= (nfsd4_dec)nfsd4_decode_open_downgrade,

	[OP_PUTFH]		= (nfsd4_dec)nfsd4_decode_putfh,

	[OP_PUTPUBFH]		= (nfsd4_dec)nfsd4_decode_notsupp,

	[OP_PUTROOTFH]		= (nfsd4_dec)nfsd4_decode_noop,

	[OP_READ]		= (nfsd4_dec)nfsd4_decode_read,

	[OP_READDIR]		= (nfsd4_dec)nfsd4_decode_readdir,

	[OP_READLINK]		= (nfsd4_dec)nfsd4_decode_noop,

	[OP_REMOVE]		= (nfsd4_dec)nfsd4_decode_remove,

	[OP_RENAME]		= (nfsd4_dec)nfsd4_decode_rename,

	[OP_RENEW]		= (nfsd4_dec)nfsd4_decode_renew,

	[OP_RESTOREFH]		= (nfsd4_dec)nfsd4_decode_noop,

	[OP_SAVEFH]		= (nfsd4_dec)nfsd4_decode_noop,

	[OP_SECINFO]		= (nfsd4_dec)nfsd4_decode_secinfo,

	[OP_SETATTR]		= (nfsd4_dec)nfsd4_decode_setattr,

	[OP_SETCLIENTID]	= (nfsd4_dec)nfsd4_decode_setclientid,

	[OP_SETCLIENTID_CONFIRM] = (nfsd4_dec)nfsd4_decode_setclientid_confirm,

	[OP_VERIFY]		= (nfsd4_dec)nfsd4_decode_verify,

	[OP_WRITE]		= (nfsd4_dec)nfsd4_decode_write,

	[OP_RELEASE_LOCKOWNER]	= (nfsd4_dec)nfsd4_decode_release_lockowner,

};



struct nfsd4_minorversion_ops {
@@ -1045,7 +1045,7 @@ struct nfsd4_minorversion_ops { 
};



static struct nfsd4_minorversion_ops nfsd4_minorversion[] = {

	[0] { nfsd4_dec_ops, ARRAY_SIZE(nfsd4_dec_ops) },

	[0] = { nfsd4_dec_ops, ARRAY_SIZE(nfsd4_dec_ops) },

};



static __be32
@@ -2577,42 +2577,42 @@ nfsd4_encode_noop(struct nfsd4_compoundres *resp, __be32 nfserr, void *p) 
typedef __be32(* nfsd4_enc)(struct nfsd4_compoundres *, __be32, void *);



static nfsd4_enc nfsd4_enc_ops[] = {

	[OP_ACCESS]		(nfsd4_enc)nfsd4_encode_access,

	[OP_CLOSE]		(nfsd4_enc)nfsd4_encode_close,

	[OP_COMMIT]		(nfsd4_enc)nfsd4_encode_commit,

	[OP_CREATE]		(nfsd4_enc)nfsd4_encode_create,

	[OP_DELEGPURGE]		(nfsd4_enc)nfsd4_encode_noop,

	[OP_DELEGRETURN]	(nfsd4_enc)nfsd4_encode_noop,

	[OP_GETATTR]		(nfsd4_enc)nfsd4_encode_getattr,

	[OP_GETFH]		(nfsd4_enc)nfsd4_encode_getfh,

	[OP_LINK]		(nfsd4_enc)nfsd4_encode_link,

	[OP_LOCK]		(nfsd4_enc)nfsd4_encode_lock,

	[OP_LOCKT]		(nfsd4_enc)nfsd4_encode_lockt,

	[OP_LOCKU]		(nfsd4_enc)nfsd4_encode_locku,

	[OP_LOOKUP]		(nfsd4_enc)nfsd4_encode_noop,

	[OP_LOOKUPP]		(nfsd4_enc)nfsd4_encode_noop,

	[OP_NVERIFY]		(nfsd4_enc)nfsd4_encode_noop,

	[OP_OPEN]		(nfsd4_enc)nfsd4_encode_open,

	[OP_OPEN_CONFIRM]	(nfsd4_enc)nfsd4_encode_open_confirm,

	[OP_OPEN_DOWNGRADE]	(nfsd4_enc)nfsd4_encode_open_downgrade,

	[OP_PUTFH]		(nfsd4_enc)nfsd4_encode_noop,

	[OP_PUTPUBFH]		(nfsd4_enc)nfsd4_encode_noop,

	[OP_PUTROOTFH]		(nfsd4_enc)nfsd4_encode_noop,

	[OP_READ]		(nfsd4_enc)nfsd4_encode_read,

	[OP_READDIR]		(nfsd4_enc)nfsd4_encode_readdir,

	[OP_READLINK]		(nfsd4_enc)nfsd4_encode_readlink,

	[OP_REMOVE]		(nfsd4_enc)nfsd4_encode_remove,

	[OP_RENAME]		(nfsd4_enc)nfsd4_encode_rename,

	[OP_RENEW]		(nfsd4_enc)nfsd4_encode_noop,

	[OP_RESTOREFH]		(nfsd4_enc)nfsd4_encode_noop,

	[OP_SAVEFH]		(nfsd4_enc)nfsd4_encode_noop,

	[OP_SECINFO]		(nfsd4_enc)nfsd4_encode_secinfo,

	[OP_SETATTR]		(nfsd4_enc)nfsd4_encode_setattr,

	[OP_SETCLIENTID]	(nfsd4_enc)nfsd4_encode_setclientid,

	[OP_SETCLIENTID_CONFIRM](nfsd4_enc)nfsd4_encode_noop,

	[OP_VERIFY]		(nfsd4_enc)nfsd4_encode_noop,

	[OP_WRITE]		(nfsd4_enc)nfsd4_encode_write,

	[OP_RELEASE_LOCKOWNER]	(nfsd4_enc)nfsd4_encode_noop,

	[OP_ACCESS]		= (nfsd4_enc)nfsd4_encode_access,

	[OP_CLOSE]		= (nfsd4_enc)nfsd4_encode_close,

	[OP_COMMIT]		= (nfsd4_enc)nfsd4_encode_commit,

	[OP_CREATE]		= (nfsd4_enc)nfsd4_encode_create,

	[OP_DELEGPURGE]		= (nfsd4_enc)nfsd4_encode_noop,

	[OP_DELEGRETURN]	= (nfsd4_enc)nfsd4_encode_noop,

	[OP_GETATTR]		= (nfsd4_enc)nfsd4_encode_getattr,

	[OP_GETFH]		= (nfsd4_enc)nfsd4_encode_getfh,

	[OP_LINK]		= (nfsd4_enc)nfsd4_encode_link,

	[OP_LOCK]		= (nfsd4_enc)nfsd4_encode_lock,

	[OP_LOCKT]		= (nfsd4_enc)nfsd4_encode_lockt,

	[OP_LOCKU]		= (nfsd4_enc)nfsd4_encode_locku,

	[OP_LOOKUP]		= (nfsd4_enc)nfsd4_encode_noop,

	[OP_LOOKUPP]		= (nfsd4_enc)nfsd4_encode_noop,

	[OP_NVERIFY]		= (nfsd4_enc)nfsd4_encode_noop,

	[OP_OPEN]		= (nfsd4_enc)nfsd4_encode_open,

	[OP_OPEN_CONFIRM]	= (nfsd4_enc)nfsd4_encode_open_confirm,

	[OP_OPEN_DOWNGRADE]	= (nfsd4_enc)nfsd4_encode_open_downgrade,

	[OP_PUTFH]		= (nfsd4_enc)nfsd4_encode_noop,

	[OP_PUTPUBFH]		= (nfsd4_enc)nfsd4_encode_noop,

	[OP_PUTROOTFH]		= (nfsd4_enc)nfsd4_encode_noop,

	[OP_READ]		= (nfsd4_enc)nfsd4_encode_read,

	[OP_READDIR]		= (nfsd4_enc)nfsd4_encode_readdir,

	[OP_READLINK]		= (nfsd4_enc)nfsd4_encode_readlink,

	[OP_REMOVE]		= (nfsd4_enc)nfsd4_encode_remove,

	[OP_RENAME]		= (nfsd4_enc)nfsd4_encode_rename,

	[OP_RENEW]		= (nfsd4_enc)nfsd4_encode_noop,

	[OP_RESTOREFH]		= (nfsd4_enc)nfsd4_encode_noop,

	[OP_SAVEFH]		= (nfsd4_enc)nfsd4_encode_noop,

	[OP_SECINFO]		= (nfsd4_enc)nfsd4_encode_secinfo,

	[OP_SETATTR]		= (nfsd4_enc)nfsd4_encode_setattr,

	[OP_SETCLIENTID]	= (nfsd4_enc)nfsd4_encode_setclientid,

	[OP_SETCLIENTID_CONFIRM] = (nfsd4_enc)nfsd4_encode_noop,

	[OP_VERIFY]		= (nfsd4_enc)nfsd4_encode_noop,

	[OP_WRITE]		= (nfsd4_enc)nfsd4_encode_write,

	[OP_RELEASE_LOCKOWNER]	= (nfsd4_enc)nfsd4_encode_noop,

};



void