summaryrefslogtreecommitdiffstats
path: root/sys/fs/nfsclient/nfs_clstate.c
diff options
context:
space:
mode:
authorrmacklem <rmacklem@FreeBSD.org>2014-08-01 21:10:41 +0000
committerrmacklem <rmacklem@FreeBSD.org>2014-08-01 21:10:41 +0000
commit50867d802b534350d2bee81cf0858b8cd871b487 (patch)
tree7ce81fe06c3c67164e672e40de7e128c98669a0c /sys/fs/nfsclient/nfs_clstate.c
parentba879dc5f5950146f01bba4a949fe57cdd5628a2 (diff)
downloadFreeBSD-src-50867d802b534350d2bee81cf0858b8cd871b487.zip
FreeBSD-src-50867d802b534350d2bee81cf0858b8cd871b487.tar.gz
MFC: r268115
Merge the NFSv4.1 server code in projects/nfsv4.1-server over into head. The code is not believed to have any effect on the semantics of non-NFSv4.1 server behaviour. It is a rather large merge, but I am hoping that there will not be any regressions for the NFS server.
Diffstat (limited to 'sys/fs/nfsclient/nfs_clstate.c')
-rw-r--r--sys/fs/nfsclient/nfs_clstate.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/fs/nfsclient/nfs_clstate.c b/sys/fs/nfsclient/nfs_clstate.c
index 6f0692c..2600b80 100644
--- a/sys/fs/nfsclient/nfs_clstate.c
+++ b/sys/fs/nfsclient/nfs_clstate.c
@@ -3548,7 +3548,7 @@ out:
if (clp != NULL) {
nfsv4_seqsess_cacherep(slotid,
NFSMNT_MDSSESSION(clp->nfsc_nmp)->nfsess_cbslots,
- rep);
+ NFSERR_OK, &rep);
NFSUNLOCKCLSTATE();
} else {
NFSUNLOCKCLSTATE();
OpenPOWER on IntegriCloud