Author: rmacklem
Date: Thu Apr 24 20:47:58 2014
New Revision: 264888
URL: http://svnweb.freebsd.org/changeset/base/264888
Log:
The PR reported that the old NFS server did not set uio_td == NULL
for the VOP_READ() call. This patch fixes both the old and new
server for this case.
PR: 185232
Submitted by: PR had patch for old server
Reviewed by: kib
MFC after: 2 weeks
Modified:
head/sys/fs/nfsserver/nfs_nfsdport.c
head/sys/nfsserver/nfs_serv.c
Modified: head/sys/fs/nfsserver/nfs_nfsdport.c
==============================================================================
--- head/sys/fs/nfsserver/nfs_nfsdport.c Thu Apr 24 17:23:16 2014
(r264887)
+++ head/sys/fs/nfsserver/nfs_nfsdport.c Thu Apr 24 20:47:58 2014
(r264888)
@@ -673,6 +673,7 @@ nfsvno_read(struct vnode *vp, off_t off,
uiop->uio_resid = len;
uiop->uio_rw = UIO_READ;
uiop->uio_segflg = UIO_SYSSPACE;
+ uiop->uio_td = NULL;
nh = nfsrv_sequential_heuristic(uiop, vp);
ioflag |= nh->nh_seqcount << IO_SEQSHIFT;
error = VOP_READ(vp, uiop, IO_NODELOCKED | ioflag, cred);
Modified: head/sys/nfsserver/nfs_serv.c
==============================================================================
--- head/sys/nfsserver/nfs_serv.c Thu Apr 24 17:23:16 2014
(r264887)
+++ head/sys/nfsserver/nfs_serv.c Thu Apr 24 20:47:58 2014
(r264888)
@@ -911,6 +911,7 @@ nfsrv_read(struct nfsrv_descript *nfsd,
uiop->uio_resid = len;
uiop->uio_rw = UIO_READ;
uiop->uio_segflg = UIO_SYSSPACE;
+ uiop->uio_td = NULL;
nh = nfsrv_sequential_heuristic(uiop, vp);
ioflag |= nh->nh_seqcount << IO_SEQSHIFT;
error = VOP_READ(vp, uiop, IO_NODELOCKED | ioflag, cred);
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
