Commit 103cc1fa authored by Chuck Lever's avatar Chuck Lever
Browse files

SUNRPC: Parametrize how much of argsize should be zeroed 



Currently, SUNRPC clears the whole of .pc_argsize before processing
each incoming RPC transaction. Add an extra parameter to struct
svc_procedure to enable upper layers to reduce the amount of each
operation's argument structure that is zeroed by SUNRPC.

The size of struct nfsd4_compoundargs, in particular, is a lot to
clear on each incoming RPC Call. A subsequent patch will cut this
down to something closer to what NFSv2 and NFSv3 uses.

This patch should cause no behavior changes.

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

fs/lockd/svc4proc.c

+24 −0
Original line number Diff line number Diff line
@@ -521,6 +521,7 @@ const struct svc_procedure nlmsvc_procedures4[24] = { 
		.pc_decode = nlm4svc_decode_void,

		.pc_encode = nlm4svc_encode_void,

		.pc_argsize = sizeof(struct nlm_void),

		.pc_argzero = sizeof(struct nlm_void),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = St,

		.pc_name = "NULL",
@@ -530,6 +531,7 @@ const struct svc_procedure nlmsvc_procedures4[24] = { 
		.pc_decode = nlm4svc_decode_testargs,

		.pc_encode = nlm4svc_encode_testres,

		.pc_argsize = sizeof(struct nlm_args),

		.pc_argzero = sizeof(struct nlm_args),

		.pc_ressize = sizeof(struct nlm_res),

		.pc_xdrressize = Ck+St+2+No+Rg,

		.pc_name = "TEST",
@@ -539,6 +541,7 @@ const struct svc_procedure nlmsvc_procedures4[24] = { 
		.pc_decode = nlm4svc_decode_lockargs,

		.pc_encode = nlm4svc_encode_res,

		.pc_argsize = sizeof(struct nlm_args),

		.pc_argzero = sizeof(struct nlm_args),

		.pc_ressize = sizeof(struct nlm_res),

		.pc_xdrressize = Ck+St,

		.pc_name = "LOCK",
@@ -548,6 +551,7 @@ const struct svc_procedure nlmsvc_procedures4[24] = { 
		.pc_decode = nlm4svc_decode_cancargs,

		.pc_encode = nlm4svc_encode_res,

		.pc_argsize = sizeof(struct nlm_args),

		.pc_argzero = sizeof(struct nlm_args),

		.pc_ressize = sizeof(struct nlm_res),

		.pc_xdrressize = Ck+St,

		.pc_name = "CANCEL",
@@ -557,6 +561,7 @@ const struct svc_procedure nlmsvc_procedures4[24] = { 
		.pc_decode = nlm4svc_decode_unlockargs,

		.pc_encode = nlm4svc_encode_res,

		.pc_argsize = sizeof(struct nlm_args),

		.pc_argzero = sizeof(struct nlm_args),

		.pc_ressize = sizeof(struct nlm_res),

		.pc_xdrressize = Ck+St,

		.pc_name = "UNLOCK",
@@ -566,6 +571,7 @@ const struct svc_procedure nlmsvc_procedures4[24] = { 
		.pc_decode = nlm4svc_decode_testargs,

		.pc_encode = nlm4svc_encode_res,

		.pc_argsize = sizeof(struct nlm_args),

		.pc_argzero = sizeof(struct nlm_args),

		.pc_ressize = sizeof(struct nlm_res),

		.pc_xdrressize = Ck+St,

		.pc_name = "GRANTED",
@@ -575,6 +581,7 @@ const struct svc_procedure nlmsvc_procedures4[24] = { 
		.pc_decode = nlm4svc_decode_testargs,

		.pc_encode = nlm4svc_encode_void,

		.pc_argsize = sizeof(struct nlm_args),

		.pc_argzero = sizeof(struct nlm_args),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = St,

		.pc_name = "TEST_MSG",
@@ -584,6 +591,7 @@ const struct svc_procedure nlmsvc_procedures4[24] = { 
		.pc_decode = nlm4svc_decode_lockargs,

		.pc_encode = nlm4svc_encode_void,

		.pc_argsize = sizeof(struct nlm_args),

		.pc_argzero = sizeof(struct nlm_args),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = St,

		.pc_name = "LOCK_MSG",
@@ -593,6 +601,7 @@ const struct svc_procedure nlmsvc_procedures4[24] = { 
		.pc_decode = nlm4svc_decode_cancargs,

		.pc_encode = nlm4svc_encode_void,

		.pc_argsize = sizeof(struct nlm_args),

		.pc_argzero = sizeof(struct nlm_args),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = St,

		.pc_name = "CANCEL_MSG",
@@ -602,6 +611,7 @@ const struct svc_procedure nlmsvc_procedures4[24] = { 
		.pc_decode = nlm4svc_decode_unlockargs,

		.pc_encode = nlm4svc_encode_void,

		.pc_argsize = sizeof(struct nlm_args),

		.pc_argzero = sizeof(struct nlm_args),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = St,

		.pc_name = "UNLOCK_MSG",
@@ -611,6 +621,7 @@ const struct svc_procedure nlmsvc_procedures4[24] = { 
		.pc_decode = nlm4svc_decode_testargs,

		.pc_encode = nlm4svc_encode_void,

		.pc_argsize = sizeof(struct nlm_args),

		.pc_argzero = sizeof(struct nlm_args),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = St,

		.pc_name = "GRANTED_MSG",
@@ -620,6 +631,7 @@ const struct svc_procedure nlmsvc_procedures4[24] = { 
		.pc_decode = nlm4svc_decode_void,

		.pc_encode = nlm4svc_encode_void,

		.pc_argsize = sizeof(struct nlm_res),

		.pc_argzero = sizeof(struct nlm_res),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = St,

		.pc_name = "TEST_RES",
@@ -629,6 +641,7 @@ const struct svc_procedure nlmsvc_procedures4[24] = { 
		.pc_decode = nlm4svc_decode_void,

		.pc_encode = nlm4svc_encode_void,

		.pc_argsize = sizeof(struct nlm_res),

		.pc_argzero = sizeof(struct nlm_res),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = St,

		.pc_name = "LOCK_RES",
@@ -638,6 +651,7 @@ const struct svc_procedure nlmsvc_procedures4[24] = { 
		.pc_decode = nlm4svc_decode_void,

		.pc_encode = nlm4svc_encode_void,

		.pc_argsize = sizeof(struct nlm_res),

		.pc_argzero = sizeof(struct nlm_res),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = St,

		.pc_name = "CANCEL_RES",
@@ -647,6 +661,7 @@ const struct svc_procedure nlmsvc_procedures4[24] = { 
		.pc_decode = nlm4svc_decode_void,

		.pc_encode = nlm4svc_encode_void,

		.pc_argsize = sizeof(struct nlm_res),

		.pc_argzero = sizeof(struct nlm_res),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = St,

		.pc_name = "UNLOCK_RES",
@@ -656,6 +671,7 @@ const struct svc_procedure nlmsvc_procedures4[24] = { 
		.pc_decode = nlm4svc_decode_res,

		.pc_encode = nlm4svc_encode_void,

		.pc_argsize = sizeof(struct nlm_res),

		.pc_argzero = sizeof(struct nlm_res),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = St,

		.pc_name = "GRANTED_RES",
@@ -665,6 +681,7 @@ const struct svc_procedure nlmsvc_procedures4[24] = { 
		.pc_decode = nlm4svc_decode_reboot,

		.pc_encode = nlm4svc_encode_void,

		.pc_argsize = sizeof(struct nlm_reboot),

		.pc_argzero = sizeof(struct nlm_reboot),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = St,

		.pc_name = "SM_NOTIFY",
@@ -674,6 +691,7 @@ const struct svc_procedure nlmsvc_procedures4[24] = { 
		.pc_decode = nlm4svc_decode_void,

		.pc_encode = nlm4svc_encode_void,

		.pc_argsize = sizeof(struct nlm_void),

		.pc_argzero = sizeof(struct nlm_void),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = 0,

		.pc_name = "UNUSED",
@@ -683,6 +701,7 @@ const struct svc_procedure nlmsvc_procedures4[24] = { 
		.pc_decode = nlm4svc_decode_void,

		.pc_encode = nlm4svc_encode_void,

		.pc_argsize = sizeof(struct nlm_void),

		.pc_argzero = sizeof(struct nlm_void),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = 0,

		.pc_name = "UNUSED",
@@ -692,6 +711,7 @@ const struct svc_procedure nlmsvc_procedures4[24] = { 
		.pc_decode = nlm4svc_decode_void,

		.pc_encode = nlm4svc_encode_void,

		.pc_argsize = sizeof(struct nlm_void),

		.pc_argzero = sizeof(struct nlm_void),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = 0,

		.pc_name = "UNUSED",
@@ -701,6 +721,7 @@ const struct svc_procedure nlmsvc_procedures4[24] = { 
		.pc_decode = nlm4svc_decode_shareargs,

		.pc_encode = nlm4svc_encode_shareres,

		.pc_argsize = sizeof(struct nlm_args),

		.pc_argzero = sizeof(struct nlm_args),

		.pc_ressize = sizeof(struct nlm_res),

		.pc_xdrressize = Ck+St+1,

		.pc_name = "SHARE",
@@ -710,6 +731,7 @@ const struct svc_procedure nlmsvc_procedures4[24] = { 
		.pc_decode = nlm4svc_decode_shareargs,

		.pc_encode = nlm4svc_encode_shareres,

		.pc_argsize = sizeof(struct nlm_args),

		.pc_argzero = sizeof(struct nlm_args),

		.pc_ressize = sizeof(struct nlm_res),

		.pc_xdrressize = Ck+St+1,

		.pc_name = "UNSHARE",
@@ -719,6 +741,7 @@ const struct svc_procedure nlmsvc_procedures4[24] = { 
		.pc_decode = nlm4svc_decode_lockargs,

		.pc_encode = nlm4svc_encode_res,

		.pc_argsize = sizeof(struct nlm_args),

		.pc_argzero = sizeof(struct nlm_args),

		.pc_ressize = sizeof(struct nlm_res),

		.pc_xdrressize = Ck+St,

		.pc_name = "NM_LOCK",
@@ -728,6 +751,7 @@ const struct svc_procedure nlmsvc_procedures4[24] = { 
		.pc_decode = nlm4svc_decode_notify,

		.pc_encode = nlm4svc_encode_void,

		.pc_argsize = sizeof(struct nlm_args),

		.pc_argzero = sizeof(struct nlm_args),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = St,

		.pc_name = "FREE_ALL",

fs/lockd/svcproc.c

+24 −0
Original line number Diff line number Diff line
@@ -555,6 +555,7 @@ const struct svc_procedure nlmsvc_procedures[24] = { 
		.pc_decode = nlmsvc_decode_void,

		.pc_encode = nlmsvc_encode_void,

		.pc_argsize = sizeof(struct nlm_void),

		.pc_argzero = sizeof(struct nlm_void),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = St,

		.pc_name = "NULL",
@@ -564,6 +565,7 @@ const struct svc_procedure nlmsvc_procedures[24] = { 
		.pc_decode = nlmsvc_decode_testargs,

		.pc_encode = nlmsvc_encode_testres,

		.pc_argsize = sizeof(struct nlm_args),

		.pc_argzero = sizeof(struct nlm_args),

		.pc_ressize = sizeof(struct nlm_res),

		.pc_xdrressize = Ck+St+2+No+Rg,

		.pc_name = "TEST",
@@ -573,6 +575,7 @@ const struct svc_procedure nlmsvc_procedures[24] = { 
		.pc_decode = nlmsvc_decode_lockargs,

		.pc_encode = nlmsvc_encode_res,

		.pc_argsize = sizeof(struct nlm_args),

		.pc_argzero = sizeof(struct nlm_args),

		.pc_ressize = sizeof(struct nlm_res),

		.pc_xdrressize = Ck+St,

		.pc_name = "LOCK",
@@ -582,6 +585,7 @@ const struct svc_procedure nlmsvc_procedures[24] = { 
		.pc_decode = nlmsvc_decode_cancargs,

		.pc_encode = nlmsvc_encode_res,

		.pc_argsize = sizeof(struct nlm_args),

		.pc_argzero = sizeof(struct nlm_args),

		.pc_ressize = sizeof(struct nlm_res),

		.pc_xdrressize = Ck+St,

		.pc_name = "CANCEL",
@@ -591,6 +595,7 @@ const struct svc_procedure nlmsvc_procedures[24] = { 
		.pc_decode = nlmsvc_decode_unlockargs,

		.pc_encode = nlmsvc_encode_res,

		.pc_argsize = sizeof(struct nlm_args),

		.pc_argzero = sizeof(struct nlm_args),

		.pc_ressize = sizeof(struct nlm_res),

		.pc_xdrressize = Ck+St,

		.pc_name = "UNLOCK",
@@ -600,6 +605,7 @@ const struct svc_procedure nlmsvc_procedures[24] = { 
		.pc_decode = nlmsvc_decode_testargs,

		.pc_encode = nlmsvc_encode_res,

		.pc_argsize = sizeof(struct nlm_args),

		.pc_argzero = sizeof(struct nlm_args),

		.pc_ressize = sizeof(struct nlm_res),

		.pc_xdrressize = Ck+St,

		.pc_name = "GRANTED",
@@ -609,6 +615,7 @@ const struct svc_procedure nlmsvc_procedures[24] = { 
		.pc_decode = nlmsvc_decode_testargs,

		.pc_encode = nlmsvc_encode_void,

		.pc_argsize = sizeof(struct nlm_args),

		.pc_argzero = sizeof(struct nlm_args),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = St,

		.pc_name = "TEST_MSG",
@@ -618,6 +625,7 @@ const struct svc_procedure nlmsvc_procedures[24] = { 
		.pc_decode = nlmsvc_decode_lockargs,

		.pc_encode = nlmsvc_encode_void,

		.pc_argsize = sizeof(struct nlm_args),

		.pc_argzero = sizeof(struct nlm_args),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = St,

		.pc_name = "LOCK_MSG",
@@ -627,6 +635,7 @@ const struct svc_procedure nlmsvc_procedures[24] = { 
		.pc_decode = nlmsvc_decode_cancargs,

		.pc_encode = nlmsvc_encode_void,

		.pc_argsize = sizeof(struct nlm_args),

		.pc_argzero = sizeof(struct nlm_args),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = St,

		.pc_name = "CANCEL_MSG",
@@ -636,6 +645,7 @@ const struct svc_procedure nlmsvc_procedures[24] = { 
		.pc_decode = nlmsvc_decode_unlockargs,

		.pc_encode = nlmsvc_encode_void,

		.pc_argsize = sizeof(struct nlm_args),

		.pc_argzero = sizeof(struct nlm_args),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = St,

		.pc_name = "UNLOCK_MSG",
@@ -645,6 +655,7 @@ const struct svc_procedure nlmsvc_procedures[24] = { 
		.pc_decode = nlmsvc_decode_testargs,

		.pc_encode = nlmsvc_encode_void,

		.pc_argsize = sizeof(struct nlm_args),

		.pc_argzero = sizeof(struct nlm_args),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = St,

		.pc_name = "GRANTED_MSG",
@@ -654,6 +665,7 @@ const struct svc_procedure nlmsvc_procedures[24] = { 
		.pc_decode = nlmsvc_decode_void,

		.pc_encode = nlmsvc_encode_void,

		.pc_argsize = sizeof(struct nlm_res),

		.pc_argzero = sizeof(struct nlm_res),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = St,

		.pc_name = "TEST_RES",
@@ -663,6 +675,7 @@ const struct svc_procedure nlmsvc_procedures[24] = { 
		.pc_decode = nlmsvc_decode_void,

		.pc_encode = nlmsvc_encode_void,

		.pc_argsize = sizeof(struct nlm_res),

		.pc_argzero = sizeof(struct nlm_res),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = St,

		.pc_name = "LOCK_RES",
@@ -672,6 +685,7 @@ const struct svc_procedure nlmsvc_procedures[24] = { 
		.pc_decode = nlmsvc_decode_void,

		.pc_encode = nlmsvc_encode_void,

		.pc_argsize = sizeof(struct nlm_res),

		.pc_argzero = sizeof(struct nlm_res),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = St,

		.pc_name = "CANCEL_RES",
@@ -681,6 +695,7 @@ const struct svc_procedure nlmsvc_procedures[24] = { 
		.pc_decode = nlmsvc_decode_void,

		.pc_encode = nlmsvc_encode_void,

		.pc_argsize = sizeof(struct nlm_res),

		.pc_argzero = sizeof(struct nlm_res),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = St,

		.pc_name = "UNLOCK_RES",
@@ -690,6 +705,7 @@ const struct svc_procedure nlmsvc_procedures[24] = { 
		.pc_decode = nlmsvc_decode_res,

		.pc_encode = nlmsvc_encode_void,

		.pc_argsize = sizeof(struct nlm_res),

		.pc_argzero = sizeof(struct nlm_res),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = St,

		.pc_name = "GRANTED_RES",
@@ -699,6 +715,7 @@ const struct svc_procedure nlmsvc_procedures[24] = { 
		.pc_decode = nlmsvc_decode_reboot,

		.pc_encode = nlmsvc_encode_void,

		.pc_argsize = sizeof(struct nlm_reboot),

		.pc_argzero = sizeof(struct nlm_reboot),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = St,

		.pc_name = "SM_NOTIFY",
@@ -708,6 +725,7 @@ const struct svc_procedure nlmsvc_procedures[24] = { 
		.pc_decode = nlmsvc_decode_void,

		.pc_encode = nlmsvc_encode_void,

		.pc_argsize = sizeof(struct nlm_void),

		.pc_argzero = sizeof(struct nlm_void),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = St,

		.pc_name = "UNUSED",
@@ -717,6 +735,7 @@ const struct svc_procedure nlmsvc_procedures[24] = { 
		.pc_decode = nlmsvc_decode_void,

		.pc_encode = nlmsvc_encode_void,

		.pc_argsize = sizeof(struct nlm_void),

		.pc_argzero = sizeof(struct nlm_void),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = St,

		.pc_name = "UNUSED",
@@ -726,6 +745,7 @@ const struct svc_procedure nlmsvc_procedures[24] = { 
		.pc_decode = nlmsvc_decode_void,

		.pc_encode = nlmsvc_encode_void,

		.pc_argsize = sizeof(struct nlm_void),

		.pc_argzero = sizeof(struct nlm_void),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = St,

		.pc_name = "UNUSED",
@@ -735,6 +755,7 @@ const struct svc_procedure nlmsvc_procedures[24] = { 
		.pc_decode = nlmsvc_decode_shareargs,

		.pc_encode = nlmsvc_encode_shareres,

		.pc_argsize = sizeof(struct nlm_args),

		.pc_argzero = sizeof(struct nlm_args),

		.pc_ressize = sizeof(struct nlm_res),

		.pc_xdrressize = Ck+St+1,

		.pc_name = "SHARE",
@@ -744,6 +765,7 @@ const struct svc_procedure nlmsvc_procedures[24] = { 
		.pc_decode = nlmsvc_decode_shareargs,

		.pc_encode = nlmsvc_encode_shareres,

		.pc_argsize = sizeof(struct nlm_args),

		.pc_argzero = sizeof(struct nlm_args),

		.pc_ressize = sizeof(struct nlm_res),

		.pc_xdrressize = Ck+St+1,

		.pc_name = "UNSHARE",
@@ -753,6 +775,7 @@ const struct svc_procedure nlmsvc_procedures[24] = { 
		.pc_decode = nlmsvc_decode_lockargs,

		.pc_encode = nlmsvc_encode_res,

		.pc_argsize = sizeof(struct nlm_args),

		.pc_argzero = sizeof(struct nlm_args),

		.pc_ressize = sizeof(struct nlm_res),

		.pc_xdrressize = Ck+St,

		.pc_name = "NM_LOCK",
@@ -762,6 +785,7 @@ const struct svc_procedure nlmsvc_procedures[24] = { 
		.pc_decode = nlmsvc_decode_notify,

		.pc_encode = nlmsvc_encode_void,

		.pc_argsize = sizeof(struct nlm_args),

		.pc_argzero = sizeof(struct nlm_args),

		.pc_ressize = sizeof(struct nlm_void),

		.pc_xdrressize = 0,

		.pc_name = "FREE_ALL",

fs/nfs/callback_xdr.c

+1 −0
Original line number Diff line number Diff line
@@ -1065,6 +1065,7 @@ static const struct svc_procedure nfs4_callback_procedures1[] = { 
		.pc_func = nfs4_callback_compound,

		.pc_encode = nfs4_encode_void,

		.pc_argsize = 256,

		.pc_argzero = 256,

		.pc_ressize = 256,

		.pc_xdrressize = NFS4_CALLBACK_BUFSIZE,

		.pc_name = "COMPOUND",

fs/nfsd/nfs2acl.c

+5 −0
Original line number Diff line number Diff line
@@ -331,6 +331,7 @@ static const struct svc_procedure nfsd_acl_procedures2[5] = { 
		.pc_decode = nfssvc_decode_voidarg,

		.pc_encode = nfssvc_encode_voidres,

		.pc_argsize = sizeof(struct nfsd_voidargs),

		.pc_argzero = sizeof(struct nfsd_voidargs),

		.pc_ressize = sizeof(struct nfsd_voidres),

		.pc_cachetype = RC_NOCACHE,

		.pc_xdrressize = ST,
@@ -342,6 +343,7 @@ static const struct svc_procedure nfsd_acl_procedures2[5] = { 
		.pc_encode = nfsaclsvc_encode_getaclres,

		.pc_release = nfsaclsvc_release_getacl,

		.pc_argsize = sizeof(struct nfsd3_getaclargs),

		.pc_argzero = sizeof(struct nfsd3_getaclargs),

		.pc_ressize = sizeof(struct nfsd3_getaclres),

		.pc_cachetype = RC_NOCACHE,

		.pc_xdrressize = ST+1+2*(1+ACL),
@@ -353,6 +355,7 @@ static const struct svc_procedure nfsd_acl_procedures2[5] = { 
		.pc_encode = nfssvc_encode_attrstatres,

		.pc_release = nfssvc_release_attrstat,

		.pc_argsize = sizeof(struct nfsd3_setaclargs),

		.pc_argzero = sizeof(struct nfsd3_setaclargs),

		.pc_ressize = sizeof(struct nfsd_attrstat),

		.pc_cachetype = RC_NOCACHE,

		.pc_xdrressize = ST+AT,
@@ -364,6 +367,7 @@ static const struct svc_procedure nfsd_acl_procedures2[5] = { 
		.pc_encode = nfssvc_encode_attrstatres,

		.pc_release = nfssvc_release_attrstat,

		.pc_argsize = sizeof(struct nfsd_fhandle),

		.pc_argzero = sizeof(struct nfsd_fhandle),

		.pc_ressize = sizeof(struct nfsd_attrstat),

		.pc_cachetype = RC_NOCACHE,

		.pc_xdrressize = ST+AT,
@@ -375,6 +379,7 @@ static const struct svc_procedure nfsd_acl_procedures2[5] = { 
		.pc_encode = nfsaclsvc_encode_accessres,

		.pc_release = nfsaclsvc_release_access,

		.pc_argsize = sizeof(struct nfsd3_accessargs),

		.pc_argzero = sizeof(struct nfsd3_accessargs),

		.pc_ressize = sizeof(struct nfsd3_accessres),

		.pc_cachetype = RC_NOCACHE,

		.pc_xdrressize = ST+AT+1,

fs/nfsd/nfs3acl.c

+3 −0
Original line number Diff line number Diff line
@@ -252,6 +252,7 @@ static const struct svc_procedure nfsd_acl_procedures3[3] = { 
		.pc_decode = nfssvc_decode_voidarg,

		.pc_encode = nfssvc_encode_voidres,

		.pc_argsize = sizeof(struct nfsd_voidargs),

		.pc_argzero = sizeof(struct nfsd_voidargs),

		.pc_ressize = sizeof(struct nfsd_voidres),

		.pc_cachetype = RC_NOCACHE,

		.pc_xdrressize = ST,
@@ -263,6 +264,7 @@ static const struct svc_procedure nfsd_acl_procedures3[3] = { 
		.pc_encode = nfs3svc_encode_getaclres,

		.pc_release = nfs3svc_release_getacl,

		.pc_argsize = sizeof(struct nfsd3_getaclargs),

		.pc_argzero = sizeof(struct nfsd3_getaclargs),

		.pc_ressize = sizeof(struct nfsd3_getaclres),

		.pc_cachetype = RC_NOCACHE,

		.pc_xdrressize = ST+1+2*(1+ACL),
@@ -274,6 +276,7 @@ static const struct svc_procedure nfsd_acl_procedures3[3] = { 
		.pc_encode = nfs3svc_encode_setaclres,

		.pc_release = nfs3svc_release_fhandle,

		.pc_argsize = sizeof(struct nfsd3_setaclargs),

		.pc_argzero = sizeof(struct nfsd3_setaclargs),

		.pc_ressize = sizeof(struct nfsd3_attrstat),

		.pc_cachetype = RC_NOCACHE,

		.pc_xdrressize = ST+pAT,