diff options
| author | rmacklem <rmacklem@FreeBSD.org> | 2014-07-01 20:47:16 +0000 |
|---|---|---|
| committer | rmacklem <rmacklem@FreeBSD.org> | 2014-07-01 20:47:16 +0000 |
| commit | 8c4948bf022f4d0ea6c54e0888660a51ad7fd9a1 (patch) | |
| tree | 45ff669d0736f88c136a6d51a4cc7c0fce738971 /sys/fs/nfsclient | |
| parent | be0e28fbe8d0634ac036e4ac2434ae4ec3a32376 (diff) | |
| download | FreeBSD-src-8c4948bf022f4d0ea6c54e0888660a51ad7fd9a1.zip FreeBSD-src-8c4948bf022f4d0ea6c54e0888660a51ad7fd9a1.tar.gz | |
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.
MFC after: 1 month
Diffstat (limited to 'sys/fs/nfsclient')
| -rw-r--r-- | sys/fs/nfsclient/nfs_clstate.c | 2 |
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(); |
