diff options
author | rmacklem <rmacklem@FreeBSD.org> | 2014-04-24 20:47:58 +0000 |
---|---|---|
committer | rmacklem <rmacklem@FreeBSD.org> | 2014-04-24 20:47:58 +0000 |
commit | 285b96444f59e952253a3ac9374885b29a03e9fe (patch) | |
tree | 2380eaffca96b9f1846dbd83569ed25dd33adc81 /sys/nfsserver | |
parent | 6e7494c7e1c3c8d00265fe530a28384c7ccdee68 (diff) | |
download | FreeBSD-src-285b96444f59e952253a3ac9374885b29a03e9fe.zip FreeBSD-src-285b96444f59e952253a3ac9374885b29a03e9fe.tar.gz |
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
Diffstat (limited to 'sys/nfsserver')
-rw-r--r-- | sys/nfsserver/nfs_serv.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sys/nfsserver/nfs_serv.c b/sys/nfsserver/nfs_serv.c index c1a7d2a..de58421 100644 --- a/sys/nfsserver/nfs_serv.c +++ b/sys/nfsserver/nfs_serv.c @@ -911,6 +911,7 @@ nfsrv_read(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, 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); |