Commit 788f7183 authored by Chuck Lever's avatar Chuck Lever
Browse files

NFSD: Add common helpers to decode void args and encode void results 



Start off the conversion to xdr_stream by de-duplicating the functions
that decode void arguments and encode void results.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent 5191955d

fs/nfsd/nfs2acl.c

+4 −17
Original line number Diff line number Diff line
@@ -185,10 +185,6 @@ static __be32 nfsacld_proc_access(struct svc_rqst *rqstp) 
/*

 * XDR decode functions

 */

static int nfsaclsvc_decode_voidarg(struct svc_rqst *rqstp, __be32 *p)

{

	return 1;

}



static int nfsaclsvc_decode_getaclargs(struct svc_rqst *rqstp, __be32 *p)

{
@@ -255,15 +251,6 @@ static int nfsaclsvc_decode_accessargs(struct svc_rqst *rqstp, __be32 *p) 
 * XDR encode functions

 */



/*

 * There must be an encoding function for void results so svc_process

 * will work properly.

 */

static int nfsaclsvc_encode_voidres(struct svc_rqst *rqstp, __be32 *p)

{

	return xdr_ressize_check(rqstp, p);

}



/* GETACL */

static int nfsaclsvc_encode_getaclres(struct svc_rqst *rqstp, __be32 *p)

{
@@ -378,10 +365,10 @@ struct nfsd3_voidargs { int dummy; }; 
static const struct svc_procedure nfsd_acl_procedures2[5] = {

	[ACLPROC2_NULL] = {

		.pc_func = nfsacld_proc_null,

		.pc_decode = nfsaclsvc_decode_voidarg,

		.pc_encode = nfsaclsvc_encode_voidres,

		.pc_argsize = sizeof(struct nfsd3_voidargs),

		.pc_ressize = sizeof(struct nfsd3_voidargs),

		.pc_decode = nfssvc_decode_voidarg,

		.pc_encode = nfssvc_encode_voidres,

		.pc_argsize = sizeof(struct nfsd_voidargs),

		.pc_ressize = sizeof(struct nfsd_voidres),

		.pc_cachetype = RC_NOCACHE,

		.pc_xdrressize = ST,

	},

fs/nfsd/nfs3acl.c

+4 −4
Original line number Diff line number Diff line
@@ -245,10 +245,10 @@ struct nfsd3_voidargs { int dummy; }; 
static const struct svc_procedure nfsd_acl_procedures3[3] = {

	[ACLPROC3_NULL] = {

		.pc_func = nfsd3_proc_null,

		.pc_decode = nfs3svc_decode_voidarg,

		.pc_encode = nfs3svc_encode_voidres,

		.pc_argsize = sizeof(struct nfsd3_voidargs),

		.pc_ressize = sizeof(struct nfsd3_voidargs),

		.pc_decode = nfssvc_decode_voidarg,

		.pc_encode = nfssvc_encode_voidres,

		.pc_argsize = sizeof(struct nfsd_voidargs),

		.pc_ressize = sizeof(struct nfsd_voidres),

		.pc_cachetype = RC_NOCACHE,

		.pc_xdrressize = ST,

	},

fs/nfsd/nfs3proc.c

+4 −6
Original line number Diff line number Diff line
@@ -692,8 +692,6 @@ nfsd3_proc_commit(struct svc_rqst *rqstp) 
#define nfsd3_attrstatres		nfsd3_attrstat

#define nfsd3_wccstatres		nfsd3_attrstat

#define nfsd3_createres			nfsd3_diropres

#define nfsd3_voidres			nfsd3_voidargs

struct nfsd3_voidargs { int dummy; };



#define ST 1		/* status*/

#define FH 17		/* filehandle with length */
@@ -704,10 +702,10 @@ struct nfsd3_voidargs { int dummy; }; 
static const struct svc_procedure nfsd_procedures3[22] = {

	[NFS3PROC_NULL] = {

		.pc_func = nfsd3_proc_null,

		.pc_decode = nfs3svc_decode_voidarg,

		.pc_encode = nfs3svc_encode_voidres,

		.pc_argsize = sizeof(struct nfsd3_voidargs),

		.pc_ressize = sizeof(struct nfsd3_voidres),

		.pc_decode = nfssvc_decode_voidarg,

		.pc_encode = nfssvc_encode_voidres,

		.pc_argsize = sizeof(struct nfsd_voidargs),

		.pc_ressize = sizeof(struct nfsd_voidres),

		.pc_cachetype = RC_NOCACHE,

		.pc_xdrressize = ST,

	},

fs/nfsd/nfs3xdr.c

+0 −11
Original line number Diff line number Diff line
@@ -304,11 +304,6 @@ void fill_post_wcc(struct svc_fh *fhp) 
/*

 * XDR decode functions

 */

int

nfs3svc_decode_voidarg(struct svc_rqst *rqstp, __be32 *p)

{

	return 1;

}



int

nfs3svc_decode_fhandle(struct svc_rqst *rqstp, __be32 *p)
@@ -642,12 +637,6 @@ nfs3svc_decode_commitargs(struct svc_rqst *rqstp, __be32 *p) 
 * XDR encode functions

 */



int

nfs3svc_encode_voidres(struct svc_rqst *rqstp, __be32 *p)

{

	return xdr_ressize_check(rqstp, p);

}



/* GETATTR */

int

nfs3svc_encode_attrstat(struct svc_rqst *rqstp, __be32 *p)

fs/nfsd/nfs4proc.c

+4 −7
Original line number Diff line number Diff line
@@ -3295,16 +3295,13 @@ static const char *nfsd4_op_name(unsigned opnum) 
	return "unknown_operation";

}



#define nfsd4_voidres			nfsd4_voidargs

struct nfsd4_voidargs { int dummy; };



static const struct svc_procedure nfsd_procedures4[2] = {

	[NFSPROC4_NULL] = {

		.pc_func = nfsd4_proc_null,

		.pc_decode = nfs4svc_decode_voidarg,

		.pc_encode = nfs4svc_encode_voidres,

		.pc_argsize = sizeof(struct nfsd4_voidargs),

		.pc_ressize = sizeof(struct nfsd4_voidres),

		.pc_decode = nfssvc_decode_voidarg,

		.pc_encode = nfssvc_encode_voidres,

		.pc_argsize = sizeof(struct nfsd_voidargs),

		.pc_ressize = sizeof(struct nfsd_voidres),

		.pc_cachetype = RC_NOCACHE,

		.pc_xdrressize = 1,

	},