aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/sunrpc
diff options
context:
space:
mode:
authorAndy Adamson <andros@netapp.com>2009-04-03 01:27:32 -0400
committerJ. Bruce Fields <bfields@citi.umich.edu>2009-04-03 20:41:12 -0400
commit2f425878b6a71571341dcd3f9e9d1a6f6355da9c (patch)
tree52735958c1614458bd6b459040f977dfc3c3e9a9 /include/linux/sunrpc
parent20766016329eb4985c2c8b2a1b2333e0f865fdf9 (diff)
nfsd: don't use the deferral service, return NFS4ERR_DELAY
On an NFSv4.1 server cache miss that causes an upcall, NFS4ERR_DELAY will be returned. It is up to the NFSv4.1 client to resend only the operations that have not been processed. Initialize rq_usedeferral to 1 in svc_process(). It sill be turned off in nfsd4_proc_compound() only when NFSv4.1 Sessions are used. Note: this isn't an adequate solution on its own. It's acceptable as a way to get some minimal 4.1 up and working, but we're going to have to find a way to avoid returning DELAY in all common cases before 4.1 can really be considered ready. Signed-off-by: Andy Adamson <andros@netapp.com> Signed-off-by: Benny Halevy <bhalevy@panasas.com> [nfsd41: reverse rq_nodeferral negative logic] Signed-off-by: Benny Halevy <bhalevy@panasas.com> [sunrpc: initialize rq_usedeferral] Signed-off-by: Andy Adamson <andros@netapp.com> Signed-off-by: Benny Halevy <bhalevy@panasas.com> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Diffstat (limited to 'include/linux/sunrpc')
-rw-r--r--include/linux/sunrpc/svc.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
index 9f9f699dd469..815dd589d4db 100644
--- a/include/linux/sunrpc/svc.h
+++ b/include/linux/sunrpc/svc.h
@@ -230,6 +230,7 @@ struct svc_rqst {
230 struct svc_cred rq_cred; /* auth info */ 230 struct svc_cred rq_cred; /* auth info */
231 void * rq_xprt_ctxt; /* transport specific context ptr */ 231 void * rq_xprt_ctxt; /* transport specific context ptr */
232 struct svc_deferred_req*rq_deferred; /* deferred request we are replaying */ 232 struct svc_deferred_req*rq_deferred; /* deferred request we are replaying */
233 int rq_usedeferral; /* use deferral */
233 234
234 size_t rq_xprt_hlen; /* xprt header len */ 235 size_t rq_xprt_hlen; /* xprt header len */
235 struct xdr_buf rq_arg; 236 struct xdr_buf rq_arg;