nfsd: turn on reply cache for NFSv4

It's sort of ridiculous that we've never had a working reply cache for
NFSv4.

On the other hand, we may still not: our current reply cache is likely
not very good, especially in the TCP case (which is the only case that
matters for v4).  What we really need here is some serious testing.

Anyway, here's a start.

Signed-off-by: J. Bruce Fields <bfields@redhat.com>

1 files changed, 15 insertions, 11 deletions

diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
index bb8397f9da25..dc5a1bf476b1 100644
--- a/fs/nfsd/nfssvc.c
+++ b/fs/nfsd/nfssvc.c
@@ -570,8 +570,22 @@ nfsd_dispatch(struct svc_rqst *rqstp, __be32 *statp)
                                 rqstp->rq_vers, rqstp->rq_proc);
         proc = rqstp->rq_procinfo;
 
+        /*
+         * Give the xdr decoder a chance to change this if it wants
+         * (necessary in the NFSv4.0 compound case)
+         */
+        rqstp->rq_cachetype = proc->pc_cachetype;
+        /* Decode arguments */
+        xdr = proc->pc_decode;
+        if (xdr && !xdr(rqstp, (__be32*)rqstp->rq_arg.head[0].iov_base,
+                        rqstp->rq_argp)) {
+                dprintk("nfsd: failed to decode arguments!\n");
+                *statp = rpc_garbage_args;
+                return 1;
+        }
+
         /* Check whether we have this call in the cache. */
-        switch (nfsd_cache_lookup(rqstp, proc->pc_cachetype)) {
+        switch (nfsd_cache_lookup(rqstp)) {
         case RC_INTR:
         case RC_DROPIT:
                 return 0;
@@ -581,16 +595,6 @@ nfsd_dispatch(struct svc_rqst *rqstp, __be32 *statp)
                 /* do it */
         }
 
-        /* Decode arguments */
-        xdr = proc->pc_decode;
-        if (xdr && !xdr(rqstp, (__be32*)rqstp->rq_arg.head[0].iov_base,
-                        rqstp->rq_argp)) {
-                dprintk("nfsd: failed to decode arguments!\n");
-                nfsd_cache_update(rqstp, RC_NOCACHE, NULL);
-                *statp = rpc_garbage_args;
-                return 1;
-        }
-
         /* need to grab the location to store the status, as
          * nfsv4 does some encoding while processing 
          */