summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@redhat.com>2012-11-16 15:22:43 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-11 09:06:55 -0800
commit12c93e196764a2092f35b30a1e924a5071f164ee (patch)
tree98380f00492fc6b1cae4670aba007b60339e86c0
parentaa8dc4af9a1ed18d71da58e883bb8260ba47afb5 (diff)
downloadlinux-3.10-12c93e196764a2092f35b30a1e924a5071f164ee.tar.gz
linux-3.10-12c93e196764a2092f35b30a1e924a5071f164ee.tar.bz2
linux-3.10-12c93e196764a2092f35b30a1e924a5071f164ee.zip
nfsd: fix v4 reply caching
commit 57d276d71aef7d8305ff002a070cb98deb2edced upstream. Very embarassing: 1091006c5eb15cba56785bd5b498a8d0b9546903 "nfsd: turn on reply cache for NFSv4" missed a line, effectively leaving the reply cache off in the v4 case. I thought I'd tested that, but I guess not. This time, wrote a pynfs test to confirm it works. Signed-off-by: J. Bruce Fields <bfields@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--fs/nfsd/nfssvc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
index b6f8e65f85b..53459b055cf 100644
--- a/fs/nfsd/nfssvc.c
+++ b/fs/nfsd/nfssvc.c
@@ -650,7 +650,7 @@ nfsd_dispatch(struct svc_rqst *rqstp, __be32 *statp)
}
/* Store reply in cache. */
- nfsd_cache_update(rqstp, proc->pc_cachetype, statp + 1);
+ nfsd_cache_update(rqstp, rqstp->rq_cachetype, statp + 1);
return 1;
}