diff options
| author | zack <zack@FreeBSD.org> | 2011-08-03 18:50:19 +0000 |
|---|---|---|
| committer | zack <zack@FreeBSD.org> | 2011-08-03 18:50:19 +0000 |
| commit | de1f0b5343c3a7812121eff0346472c63e25046a (patch) | |
| tree | 335fc109c780e27d1453700b3d06fc9b85fdca94 /sys/fs | |
| parent | 0ac1b3709ed0f81448f50c9b71d285b0c5e50b78 (diff) | |
| download | FreeBSD-src-de1f0b5343c3a7812121eff0346472c63e25046a.zip FreeBSD-src-de1f0b5343c3a7812121eff0346472c63e25046a.tar.gz | |
Fix an NFS server issue where it was not correctly setting the eof flag when a
READ had hit the end of the file. Also, clean up some cruft in the code.
Approved by: re (kib)
Reviewed by: rmacklem
MFC after: 2 weeks
Diffstat (limited to 'sys/fs')
| -rw-r--r-- | sys/fs/nfsserver/nfs_nfsdserv.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/fs/nfsserver/nfs_nfsdserv.c b/sys/fs/nfsserver/nfs_nfsdserv.c index 436d44c..d234e91 100644 --- a/sys/fs/nfsserver/nfs_nfsdserv.c +++ b/sys/fs/nfsserver/nfs_nfsdserv.c @@ -620,7 +620,7 @@ nfsrvd_read(struct nfsrv_descript *nd, __unused int isdgram, vnode_t vp, NFSPROC_T *p, struct nfsexstuff *exp) { u_int32_t *tl; - int error = 0, cnt, len, getret = 1, reqlen, eof = 0; + int error = 0, cnt, getret = 1, reqlen, eof = 0; mbuf_t m2, m3; struct nfsvattr nva; off_t off = 0x0; @@ -714,11 +714,11 @@ nfsrvd_read(struct nfsrv_descript *nd, __unused int isdgram, eof = 1; } else if (reqlen == 0) cnt = 0; - else if ((off + reqlen) > nva.na_size) + else if ((off + reqlen) >= nva.na_size) { cnt = nva.na_size - off; - else + eof = 1; + } else cnt = reqlen; - len = NFSM_RNDUP(cnt); m3 = NULL; if (cnt > 0) { nd->nd_repstat = nfsvno_read(vp, off, cnt, nd->nd_cred, p, @@ -748,7 +748,7 @@ nfsrvd_read(struct nfsrv_descript *nd, __unused int isdgram, *tl++ = txdr_unsigned(cnt); } else NFSM_BUILD(tl, u_int32_t *, 2 * NFSX_UNSIGNED); - if (len < reqlen || eof) + if (eof) *tl++ = newnfs_true; else *tl++ = newnfs_false; |
