SUNRPC: Parametrize how much of argsize should be zeroed

[ Upstream commit 103cc1fafee48adb91fca0e19deb869fd23e46ab ]

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: Chuck Lever <chuck.lever@oracle.com>

diff --git a/fs/lockd/svc4proc.c b/fs/lockd/svc4proc.c
index 930e90f21b151ceb028a130377c50d03bd311349..742b8d31d2fad0691d95b4f14340ceed065ed7ad 100644 (file)
--- a/fs/lockd/svc4proc.c
+++ b/fs/lockd/svc4proc.c
@@ -523,6 +523,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",
@@ -532,6 +533,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",
@@ -541,6 +543,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",
@@ -550,6 +553,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",
@@ -559,6 +563,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",
@@ -568,6 +573,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",
@@ -577,6 +583,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",
@@ -586,6 +593,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",
@@ -595,6 +603,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",
@@ -604,6 +613,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",
@@ -613,6 +623,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",
@@ -622,6 +633,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",
@@ -631,6 +643,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",
@@ -640,6 +653,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",
@@ -649,6 +663,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",
@@ -658,6 +673,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",
@@ -667,6 +683,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",
@@ -676,6 +693,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",
@@ -685,6 +703,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",
@@ -694,6 +713,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",
@@ -703,6 +723,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",
@@ -712,6 +733,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",
@@ -721,6 +743,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",
@@ -730,6 +753,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",

diff --git a/fs/lockd/svcproc.c b/fs/lockd/svcproc.c
index c215a4599d5c828c5b21b8e0b8f0bd18db3e4110..7e25d5583c7d0ca81a3eab8cea1d05bc03882fee 100644 (file)
--- a/fs/lockd/svcproc.c
+++ b/fs/lockd/svcproc.c
@@ -557,6 +557,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",
@@ -566,6 +567,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",
@@ -575,6 +577,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",
@@ -584,6 +587,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",
@@ -593,6 +597,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",
@@ -602,6 +607,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",
@@ -611,6 +617,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",
@@ -620,6 +627,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",
@@ -629,6 +637,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",
@@ -638,6 +647,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",
@@ -647,6 +657,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",
@@ -656,6 +667,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",
@@ -665,6 +677,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",
@@ -674,6 +687,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",
@@ -683,6 +697,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",
@@ -692,6 +707,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",
@@ -701,6 +717,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",
@@ -710,6 +727,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",
@@ -719,6 +737,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",
@@ -728,6 +747,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",
@@ -737,6 +757,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",
@@ -746,6 +767,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",
@@ -755,6 +777,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",
@@ -764,6 +787,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",

diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c
index 8dcb08e1a885d623f82427cc3bc261949c043957..d0cccddb7d0885fe98f477324fdd50012faf3cb7 100644 (file)
--- a/fs/nfs/callback_xdr.c
+++ b/fs/nfs/callback_xdr.c
@@ -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",

diff --git a/fs/nfsd/nfs2acl.c b/fs/nfsd/nfs2acl.c
index 87f224cd30a85869ff662d1210b1a75289d802d9..65d4511b7af08fabeae457099d5f69ed9904238a 100644 (file)
--- a/fs/nfsd/nfs2acl.c
+++ b/fs/nfsd/nfs2acl.c
@@ -321,6 +321,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,
@@ -332,6 +333,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),
@@ -343,6 +345,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,
@@ -354,6 +357,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,
@@ -365,6 +369,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,

diff --git a/fs/nfsd/nfs3acl.c b/fs/nfsd/nfs3acl.c
index 9446c67436649cebfbdca11ea82820b3586c0c13..2fb9ee3564558e11205f34593de438f40824896a 100644 (file)
--- a/fs/nfsd/nfs3acl.c
+++ b/fs/nfsd/nfs3acl.c
@@ -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,

diff --git a/fs/nfsd/nfs3proc.c b/fs/nfsd/nfs3proc.c
index 5b1e771238b352f0724249f360431b6352f597c3..58695e4e18b46eadea56537cc01900ab457ed0d5 100644 (file)
--- a/fs/nfsd/nfs3proc.c
+++ b/fs/nfsd/nfs3proc.c
@@ -809,6 +809,7 @@ static const struct svc_procedure nfsd_procedures3[22] = {
                .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,
@@ -820,6 +821,7 @@ static const struct svc_procedure nfsd_procedures3[22] = {
                .pc_encode = nfs3svc_encode_getattrres,
                .pc_release = nfs3svc_release_fhandle,
                .pc_argsize = sizeof(struct nfsd_fhandle),
+               .pc_argzero = sizeof(struct nfsd_fhandle),
                .pc_ressize = sizeof(struct nfsd3_attrstatres),
                .pc_cachetype = RC_NOCACHE,
                .pc_xdrressize = ST+AT,
@@ -831,6 +833,7 @@ static const struct svc_procedure nfsd_procedures3[22] = {
                .pc_encode = nfs3svc_encode_wccstatres,
                .pc_release = nfs3svc_release_fhandle,
                .pc_argsize = sizeof(struct nfsd3_sattrargs),
+               .pc_argzero = sizeof(struct nfsd3_sattrargs),
                .pc_ressize = sizeof(struct nfsd3_wccstatres),
                .pc_cachetype = RC_REPLBUFF,
                .pc_xdrressize = ST+WC,
@@ -842,6 +845,7 @@ static const struct svc_procedure nfsd_procedures3[22] = {
                .pc_encode = nfs3svc_encode_lookupres,
                .pc_release = nfs3svc_release_fhandle2,
                .pc_argsize = sizeof(struct nfsd3_diropargs),
+               .pc_argzero = sizeof(struct nfsd3_diropargs),
                .pc_ressize = sizeof(struct nfsd3_diropres),
                .pc_cachetype = RC_NOCACHE,
                .pc_xdrressize = ST+FH+pAT+pAT,
@@ -853,6 +857,7 @@ static const struct svc_procedure nfsd_procedures3[22] = {
                .pc_encode = nfs3svc_encode_accessres,
                .pc_release = nfs3svc_release_fhandle,
                .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+pAT+1,
@@ -864,6 +869,7 @@ static const struct svc_procedure nfsd_procedures3[22] = {
                .pc_encode = nfs3svc_encode_readlinkres,
                .pc_release = nfs3svc_release_fhandle,
                .pc_argsize = sizeof(struct nfsd_fhandle),
+               .pc_argzero = sizeof(struct nfsd_fhandle),
                .pc_ressize = sizeof(struct nfsd3_readlinkres),
                .pc_cachetype = RC_NOCACHE,
                .pc_xdrressize = ST+pAT+1+NFS3_MAXPATHLEN/4,
@@ -875,6 +881,7 @@ static const struct svc_procedure nfsd_procedures3[22] = {
                .pc_encode = nfs3svc_encode_readres,
                .pc_release = nfs3svc_release_fhandle,
                .pc_argsize = sizeof(struct nfsd3_readargs),
+               .pc_argzero = sizeof(struct nfsd3_readargs),
                .pc_ressize = sizeof(struct nfsd3_readres),
                .pc_cachetype = RC_NOCACHE,
                .pc_xdrressize = ST+pAT+4+NFSSVC_MAXBLKSIZE/4,
@@ -886,6 +893,7 @@ static const struct svc_procedure nfsd_procedures3[22] = {
                .pc_encode = nfs3svc_encode_writeres,
                .pc_release = nfs3svc_release_fhandle,
                .pc_argsize = sizeof(struct nfsd3_writeargs),
+               .pc_argzero = sizeof(struct nfsd3_writeargs),
                .pc_ressize = sizeof(struct nfsd3_writeres),
                .pc_cachetype = RC_REPLBUFF,
                .pc_xdrressize = ST+WC+4,
@@ -897,6 +905,7 @@ static const struct svc_procedure nfsd_procedures3[22] = {
                .pc_encode = nfs3svc_encode_createres,
                .pc_release = nfs3svc_release_fhandle2,
                .pc_argsize = sizeof(struct nfsd3_createargs),
+               .pc_argzero = sizeof(struct nfsd3_createargs),
                .pc_ressize = sizeof(struct nfsd3_createres),
                .pc_cachetype = RC_REPLBUFF,
                .pc_xdrressize = ST+(1+FH+pAT)+WC,
@@ -908,6 +917,7 @@ static const struct svc_procedure nfsd_procedures3[22] = {
                .pc_encode = nfs3svc_encode_createres,
                .pc_release = nfs3svc_release_fhandle2,
                .pc_argsize = sizeof(struct nfsd3_mkdirargs),
+               .pc_argzero = sizeof(struct nfsd3_mkdirargs),
                .pc_ressize = sizeof(struct nfsd3_createres),
                .pc_cachetype = RC_REPLBUFF,
                .pc_xdrressize = ST+(1+FH+pAT)+WC,
@@ -919,6 +929,7 @@ static const struct svc_procedure nfsd_procedures3[22] = {
                .pc_encode = nfs3svc_encode_createres,
                .pc_release = nfs3svc_release_fhandle2,
                .pc_argsize = sizeof(struct nfsd3_symlinkargs),
+               .pc_argzero = sizeof(struct nfsd3_symlinkargs),
                .pc_ressize = sizeof(struct nfsd3_createres),
                .pc_cachetype = RC_REPLBUFF,
                .pc_xdrressize = ST+(1+FH+pAT)+WC,
@@ -930,6 +941,7 @@ static const struct svc_procedure nfsd_procedures3[22] = {
                .pc_encode = nfs3svc_encode_createres,
                .pc_release = nfs3svc_release_fhandle2,
                .pc_argsize = sizeof(struct nfsd3_mknodargs),
+               .pc_argzero = sizeof(struct nfsd3_mknodargs),
                .pc_ressize = sizeof(struct nfsd3_createres),
                .pc_cachetype = RC_REPLBUFF,
                .pc_xdrressize = ST+(1+FH+pAT)+WC,
@@ -941,6 +953,7 @@ static const struct svc_procedure nfsd_procedures3[22] = {
                .pc_encode = nfs3svc_encode_wccstatres,
                .pc_release = nfs3svc_release_fhandle,
                .pc_argsize = sizeof(struct nfsd3_diropargs),
+               .pc_argzero = sizeof(struct nfsd3_diropargs),
                .pc_ressize = sizeof(struct nfsd3_wccstatres),
                .pc_cachetype = RC_REPLBUFF,
                .pc_xdrressize = ST+WC,
@@ -952,6 +965,7 @@ static const struct svc_procedure nfsd_procedures3[22] = {
                .pc_encode = nfs3svc_encode_wccstatres,
                .pc_release = nfs3svc_release_fhandle,
                .pc_argsize = sizeof(struct nfsd3_diropargs),
+               .pc_argzero = sizeof(struct nfsd3_diropargs),
                .pc_ressize = sizeof(struct nfsd3_wccstatres),
                .pc_cachetype = RC_REPLBUFF,
                .pc_xdrressize = ST+WC,
@@ -963,6 +977,7 @@ static const struct svc_procedure nfsd_procedures3[22] = {
                .pc_encode = nfs3svc_encode_renameres,
                .pc_release = nfs3svc_release_fhandle2,
                .pc_argsize = sizeof(struct nfsd3_renameargs),
+               .pc_argzero = sizeof(struct nfsd3_renameargs),
                .pc_ressize = sizeof(struct nfsd3_renameres),
                .pc_cachetype = RC_REPLBUFF,
                .pc_xdrressize = ST+WC+WC,
@@ -974,6 +989,7 @@ static const struct svc_procedure nfsd_procedures3[22] = {
                .pc_encode = nfs3svc_encode_linkres,
                .pc_release = nfs3svc_release_fhandle2,
                .pc_argsize = sizeof(struct nfsd3_linkargs),
+               .pc_argzero = sizeof(struct nfsd3_linkargs),
                .pc_ressize = sizeof(struct nfsd3_linkres),
                .pc_cachetype = RC_REPLBUFF,
                .pc_xdrressize = ST+pAT+WC,
@@ -985,6 +1001,7 @@ static const struct svc_procedure nfsd_procedures3[22] = {
                .pc_encode = nfs3svc_encode_readdirres,
                .pc_release = nfs3svc_release_fhandle,
                .pc_argsize = sizeof(struct nfsd3_readdirargs),
+               .pc_argzero = sizeof(struct nfsd3_readdirargs),
                .pc_ressize = sizeof(struct nfsd3_readdirres),
                .pc_cachetype = RC_NOCACHE,
                .pc_name = "READDIR",
@@ -995,6 +1012,7 @@ static const struct svc_procedure nfsd_procedures3[22] = {
                .pc_encode = nfs3svc_encode_readdirres,
                .pc_release = nfs3svc_release_fhandle,
                .pc_argsize = sizeof(struct nfsd3_readdirplusargs),
+               .pc_argzero = sizeof(struct nfsd3_readdirplusargs),
                .pc_ressize = sizeof(struct nfsd3_readdirres),
                .pc_cachetype = RC_NOCACHE,
                .pc_name = "READDIRPLUS",
@@ -1004,6 +1022,7 @@ static const struct svc_procedure nfsd_procedures3[22] = {
                .pc_decode = nfs3svc_decode_fhandleargs,
                .pc_encode = nfs3svc_encode_fsstatres,
                .pc_argsize = sizeof(struct nfsd3_fhandleargs),
+               .pc_argzero = sizeof(struct nfsd3_fhandleargs),
                .pc_ressize = sizeof(struct nfsd3_fsstatres),
                .pc_cachetype = RC_NOCACHE,
                .pc_xdrressize = ST+pAT+2*6+1,
@@ -1014,6 +1033,7 @@ static const struct svc_procedure nfsd_procedures3[22] = {
                .pc_decode = nfs3svc_decode_fhandleargs,
                .pc_encode = nfs3svc_encode_fsinfores,
                .pc_argsize = sizeof(struct nfsd3_fhandleargs),
+               .pc_argzero = sizeof(struct nfsd3_fhandleargs),
                .pc_ressize = sizeof(struct nfsd3_fsinfores),
                .pc_cachetype = RC_NOCACHE,
                .pc_xdrressize = ST+pAT+12,
@@ -1024,6 +1044,7 @@ static const struct svc_procedure nfsd_procedures3[22] = {
                .pc_decode = nfs3svc_decode_fhandleargs,
                .pc_encode = nfs3svc_encode_pathconfres,
                .pc_argsize = sizeof(struct nfsd3_fhandleargs),
+               .pc_argzero = sizeof(struct nfsd3_fhandleargs),
                .pc_ressize = sizeof(struct nfsd3_pathconfres),
                .pc_cachetype = RC_NOCACHE,
                .pc_xdrressize = ST+pAT+6,
@@ -1035,6 +1056,7 @@ static const struct svc_procedure nfsd_procedures3[22] = {
                .pc_encode = nfs3svc_encode_commitres,
                .pc_release = nfs3svc_release_fhandle,
                .pc_argsize = sizeof(struct nfsd3_commitargs),
+               .pc_argzero = sizeof(struct nfsd3_commitargs),
                .pc_ressize = sizeof(struct nfsd3_commitres),
                .pc_cachetype = RC_NOCACHE,
                .pc_xdrressize = ST+WC+2,

diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index ce8062c9593151fb7a1bb6ee0293f873c7100ec3..8aae0fb4846bcf3971094892b05e14bc902a92d0 100644 (file)
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -3579,6 +3579,7 @@ static const struct svc_procedure nfsd_procedures4[2] = {
                .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 = 1,
@@ -3589,6 +3590,7 @@ static const struct svc_procedure nfsd_procedures4[2] = {
                .pc_decode = nfs4svc_decode_compoundargs,
                .pc_encode = nfs4svc_encode_compoundres,
                .pc_argsize = sizeof(struct nfsd4_compoundargs),
+               .pc_argzero = sizeof(struct nfsd4_compoundargs),
                .pc_ressize = sizeof(struct nfsd4_compoundres),
                .pc_release = nfsd4_release_compoundargs,
                .pc_cachetype = RC_NOCACHE,

diff --git a/fs/nfsd/nfsproc.c b/fs/nfsd/nfsproc.c
index ee02ede74bf53d6a5d853339d2eef47a84f1335c..49778ff410e32a8424e9a780afdb1d8c98d7bcad 100644 (file)
--- a/fs/nfsd/nfsproc.c
+++ b/fs/nfsd/nfsproc.c
@@ -645,6 +645,7 @@ static const struct svc_procedure nfsd_procedures2[18] = {
                .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 = 0,
@@ -656,6 +657,7 @@ static const struct svc_procedure nfsd_procedures2[18] = {
                .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,
@@ -667,6 +669,7 @@ static const struct svc_procedure nfsd_procedures2[18] = {
                .pc_encode = nfssvc_encode_attrstatres,
                .pc_release = nfssvc_release_attrstat,
                .pc_argsize = sizeof(struct nfsd_sattrargs),
+               .pc_argzero = sizeof(struct nfsd_sattrargs),
                .pc_ressize = sizeof(struct nfsd_attrstat),
                .pc_cachetype = RC_REPLBUFF,
                .pc_xdrressize = ST+AT,
@@ -677,6 +680,7 @@ static const struct svc_procedure nfsd_procedures2[18] = {
                .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 = 0,
@@ -688,6 +692,7 @@ static const struct svc_procedure nfsd_procedures2[18] = {
                .pc_encode = nfssvc_encode_diropres,
                .pc_release = nfssvc_release_diropres,
                .pc_argsize = sizeof(struct nfsd_diropargs),
+               .pc_argzero = sizeof(struct nfsd_diropargs),
                .pc_ressize = sizeof(struct nfsd_diropres),
                .pc_cachetype = RC_NOCACHE,
                .pc_xdrressize = ST+FH+AT,
@@ -698,6 +703,7 @@ static const struct svc_procedure nfsd_procedures2[18] = {
                .pc_decode = nfssvc_decode_fhandleargs,
                .pc_encode = nfssvc_encode_readlinkres,
                .pc_argsize = sizeof(struct nfsd_fhandle),
+               .pc_argzero = sizeof(struct nfsd_fhandle),
                .pc_ressize = sizeof(struct nfsd_readlinkres),
                .pc_cachetype = RC_NOCACHE,
                .pc_xdrressize = ST+1+NFS_MAXPATHLEN/4,
@@ -709,6 +715,7 @@ static const struct svc_procedure nfsd_procedures2[18] = {
                .pc_encode = nfssvc_encode_readres,
                .pc_release = nfssvc_release_readres,
                .pc_argsize = sizeof(struct nfsd_readargs),
+               .pc_argzero = sizeof(struct nfsd_readargs),
                .pc_ressize = sizeof(struct nfsd_readres),
                .pc_cachetype = RC_NOCACHE,
                .pc_xdrressize = ST+AT+1+NFSSVC_MAXBLKSIZE_V2/4,
@@ -719,6 +726,7 @@ static const struct svc_procedure nfsd_procedures2[18] = {
                .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 = 0,
@@ -730,6 +738,7 @@ static const struct svc_procedure nfsd_procedures2[18] = {
                .pc_encode = nfssvc_encode_attrstatres,
                .pc_release = nfssvc_release_attrstat,
                .pc_argsize = sizeof(struct nfsd_writeargs),
+               .pc_argzero = sizeof(struct nfsd_writeargs),
                .pc_ressize = sizeof(struct nfsd_attrstat),
                .pc_cachetype = RC_REPLBUFF,
                .pc_xdrressize = ST+AT,
@@ -741,6 +750,7 @@ static const struct svc_procedure nfsd_procedures2[18] = {
                .pc_encode = nfssvc_encode_diropres,
                .pc_release = nfssvc_release_diropres,
                .pc_argsize = sizeof(struct nfsd_createargs),
+               .pc_argzero = sizeof(struct nfsd_createargs),
                .pc_ressize = sizeof(struct nfsd_diropres),
                .pc_cachetype = RC_REPLBUFF,
                .pc_xdrressize = ST+FH+AT,
@@ -751,6 +761,7 @@ static const struct svc_procedure nfsd_procedures2[18] = {
                .pc_decode = nfssvc_decode_diropargs,
                .pc_encode = nfssvc_encode_statres,
                .pc_argsize = sizeof(struct nfsd_diropargs),
+               .pc_argzero = sizeof(struct nfsd_diropargs),
                .pc_ressize = sizeof(struct nfsd_stat),
                .pc_cachetype = RC_REPLSTAT,
                .pc_xdrressize = ST,
@@ -761,6 +772,7 @@ static const struct svc_procedure nfsd_procedures2[18] = {
                .pc_decode = nfssvc_decode_renameargs,
                .pc_encode = nfssvc_encode_statres,
                .pc_argsize = sizeof(struct nfsd_renameargs),
+               .pc_argzero = sizeof(struct nfsd_renameargs),
                .pc_ressize = sizeof(struct nfsd_stat),
                .pc_cachetype = RC_REPLSTAT,
                .pc_xdrressize = ST,
@@ -771,6 +783,7 @@ static const struct svc_procedure nfsd_procedures2[18] = {
                .pc_decode = nfssvc_decode_linkargs,
                .pc_encode = nfssvc_encode_statres,
                .pc_argsize = sizeof(struct nfsd_linkargs),
+               .pc_argzero = sizeof(struct nfsd_linkargs),
                .pc_ressize = sizeof(struct nfsd_stat),
                .pc_cachetype = RC_REPLSTAT,
                .pc_xdrressize = ST,
@@ -781,6 +794,7 @@ static const struct svc_procedure nfsd_procedures2[18] = {
                .pc_decode = nfssvc_decode_symlinkargs,
                .pc_encode = nfssvc_encode_statres,
                .pc_argsize = sizeof(struct nfsd_symlinkargs),
+               .pc_argzero = sizeof(struct nfsd_symlinkargs),
                .pc_ressize = sizeof(struct nfsd_stat),
                .pc_cachetype = RC_REPLSTAT,
                .pc_xdrressize = ST,
@@ -792,6 +806,7 @@ static const struct svc_procedure nfsd_procedures2[18] = {
                .pc_encode = nfssvc_encode_diropres,
                .pc_release = nfssvc_release_diropres,
                .pc_argsize = sizeof(struct nfsd_createargs),
+               .pc_argzero = sizeof(struct nfsd_createargs),
                .pc_ressize = sizeof(struct nfsd_diropres),
                .pc_cachetype = RC_REPLBUFF,
                .pc_xdrressize = ST+FH+AT,
@@ -802,6 +817,7 @@ static const struct svc_procedure nfsd_procedures2[18] = {
                .pc_decode = nfssvc_decode_diropargs,
                .pc_encode = nfssvc_encode_statres,
                .pc_argsize = sizeof(struct nfsd_diropargs),
+               .pc_argzero = sizeof(struct nfsd_diropargs),
                .pc_ressize = sizeof(struct nfsd_stat),
                .pc_cachetype = RC_REPLSTAT,
                .pc_xdrressize = ST,
@@ -812,6 +828,7 @@ static const struct svc_procedure nfsd_procedures2[18] = {
                .pc_decode = nfssvc_decode_readdirargs,
                .pc_encode = nfssvc_encode_readdirres,
                .pc_argsize = sizeof(struct nfsd_readdirargs),
+               .pc_argzero = sizeof(struct nfsd_readdirargs),
                .pc_ressize = sizeof(struct nfsd_readdirres),
                .pc_cachetype = RC_NOCACHE,
                .pc_name = "READDIR",
@@ -821,6 +838,7 @@ static const struct svc_procedure nfsd_procedures2[18] = {
                .pc_decode = nfssvc_decode_fhandleargs,
                .pc_encode = nfssvc_encode_statfsres,
                .pc_argsize = sizeof(struct nfsd_fhandle),
+               .pc_argzero = sizeof(struct nfsd_fhandle),
                .pc_ressize = sizeof(struct nfsd_statfsres),
                .pc_cachetype = RC_NOCACHE,
                .pc_xdrressize = ST+5,

diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
index 1d9a81bab3fa26c3f0cc8c7c428b52065d7ea7bc..53405c282209f0987aeae33a7c6c31cc63b2dc0d 100644 (file)
--- a/include/linux/sunrpc/svc.h
+++ b/include/linux/sunrpc/svc.h
@@ -475,6 +475,7 @@ struct svc_procedure {
        /* XDR free result: */
        void                    (*pc_release)(struct svc_rqst *);
        unsigned int            pc_argsize;     /* argument struct size */
+       unsigned int            pc_argzero;     /* how much of argument to clear */
        unsigned int            pc_ressize;     /* result struct size */
        unsigned int            pc_cachetype;   /* cache info (NFS) */
        unsigned int            pc_xdrressize;  /* maximum size of XDR reply */

diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index f2a8c1ee8530efe10a8fc157ec97a10ed884b3db..86f00019d0ebb5d608be680274dcd848ebff847f 100644 (file)
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -1242,7 +1242,7 @@ svc_generic_init_request(struct svc_rqst *rqstp,
                goto err_bad_proc;
 
        /* Initialize storage for argp and resp */
-       memset(rqstp->rq_argp, 0, procp->pc_argsize);
+       memset(rqstp->rq_argp, 0, procp->pc_argzero);
        memset(rqstp->rq_resp, 0, procp->pc_ressize);
 
        /* Bump per-procedure stats counter */