Commit dcc46991 authored by Chuck Lever's avatar Chuck Lever Committed by J. Bruce Fields
Browse files

NFSD: Encoder and decoder functions are always present 



nfsd_dispatch() is a hot path. Let's optimize the XDR method calls
for the by-far common case, which is that the XDR methods are indeed
present.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent ba1df797

fs/nfsd/nfs2acl.c

+6 −0
Original line number Diff line number Diff line
@@ -183,6 +183,11 @@ 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)

{

	struct nfsd3_getaclargs *argp = rqstp->rq_argp;
@@ -357,6 +362,7 @@ 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),

fs/nfsd/nfs3acl.c

+1 −0
Original line number Diff line number Diff line
@@ -245,6 +245,7 @@ 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),

fs/nfsd/nfs3proc.c

+1 −0
Original line number Diff line number Diff line
@@ -716,6 +716,7 @@ 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),

fs/nfsd/nfs3xdr.c

+6 −0
Original line number Diff line number Diff line
@@ -304,6 +304,12 @@ 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)

{

fs/nfsd/nfs4proc.c

+1 −0
Original line number Diff line number Diff line
@@ -3279,6 +3279,7 @@ 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),