aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfsd
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@redhat.com>2012-11-16 15:22:43 -0500
committerBen Hutchings <ben@decadent.org.uk>2013-01-03 03:33:16 +0000
commite88b9090be26e674bda11fbad6dd7056065c1196 (patch)
tree5045e7c5e6b30d2879f15875092252fb47cb2cef /fs/nfsd
parent11ccb82b604fe91f67899d615b3b3a7b86e39134 (diff)
downloadkernel_samsung_smdk4412-e88b9090be26e674bda11fbad6dd7056065c1196.zip
kernel_samsung_smdk4412-e88b9090be26e674bda11fbad6dd7056065c1196.tar.gz
kernel_samsung_smdk4412-e88b9090be26e674bda11fbad6dd7056065c1196.tar.bz2
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: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'fs/nfsd')
-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 eda7d7e..7595582 100644
--- a/fs/nfsd/nfssvc.c
+++ b/fs/nfsd/nfssvc.c
@@ -633,7 +633,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;
}