svn commit: r265667 - in stable/10/sys: fs/nfsserver nfsserver

[Rick Macklem]

Author: rmacklem
Date: Thu May  8 11:59:23 2014
New Revision: 265667
URL: http://svnweb.freebsd.org/changeset/base/265667

Log:
  MFC: r264888
  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.

Modified:
  stable/10/sys/fs/nfsserver/nfs_nfsdport.c
  stable/10/sys/nfsserver/nfs_serv.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/fs/nfsserver/nfs_nfsdport.c
==============================================================================
--- stable/10/sys/fs/nfsserver/nfs_nfsdport.c	Thu May  8 11:56:06 2014	(r265666)
+++ stable/10/sys/fs/nfsserver/nfs_nfsdport.c	Thu May  8 11:59:23 2014	(r265667)
@@ -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: stable/10/sys/nfsserver/nfs_serv.c
==============================================================================
--- stable/10/sys/nfsserver/nfs_serv.c	Thu May  8 11:56:06 2014	(r265666)
+++ stable/10/sys/nfsserver/nfs_serv.c	Thu May  8 11:59:23 2014	(r265667)
@@ -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);