summaryrefslogtreecommitdiffstats
path: root/sys/fs/nfsserver
diff options
context:
space:
mode:
authorrmacklem <rmacklem@FreeBSD.org>2012-12-08 22:52:39 +0000
committerrmacklem <rmacklem@FreeBSD.org>2012-12-08 22:52:39 +0000
commitc82d89183db93c8a4a4a1db712fa5464d28ff9a3 (patch)
tree1d0d5926e781fef2471af6865dd51ab8fbdb8620 /sys/fs/nfsserver
parent98601953890f2c4381eda07f2914bfc1f8b114ec (diff)
downloadFreeBSD-src-c82d89183db93c8a4a4a1db712fa5464d28ff9a3.zip
FreeBSD-src-c82d89183db93c8a4a4a1db712fa5464d28ff9a3.tar.gz
Move the NFSv4.1 client patches over from projects/nfsv4.1-client
to head. I don't think the NFS client behaviour will change unless the new "minorversion=1" mount option is used. It includes basic NFSv4.1 support plus support for pNFS using the Files Layout only. All problems detecting during an NFSv4.1 Bakeathon testing event in June 2012 have been resolved in this code and it has been tested against the NFSv4.1 server available to me. Although not reviewed, I believe that kib@ has looked at it.
Diffstat (limited to 'sys/fs/nfsserver')
-rw-r--r--sys/fs/nfsserver/nfs_nfsdstate.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/fs/nfsserver/nfs_nfsdstate.c b/sys/fs/nfsserver/nfs_nfsdstate.c
index 515f811..8b2f8b8 100644
--- a/sys/fs/nfsserver/nfs_nfsdstate.c
+++ b/sys/fs/nfsserver/nfs_nfsdstate.c
@@ -3780,7 +3780,8 @@ nfsrv_docallback(struct nfsclient *clp, int procnum,
newnfs_sndunlock(&clp->lc_req.nr_lock);
if (!error) {
error = newnfs_request(nd, NULL, clp, &clp->lc_req, NULL,
- NULL, cred, clp->lc_program, NFSV4_CBVERS, NULL, 1, NULL);
+ NULL, cred, clp->lc_program, NFSV4_CBVERS, NULL, 1, NULL,
+ NULL);
}
NFSFREECRED(cred);
OpenPOWER on IntegriCloud