From owner-svn-src-all@FreeBSD.ORG  Wed Aug  3 18:50:19 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D66BC1065670;
	Wed,  3 Aug 2011 18:50:19 +0000 (UTC)
	(envelope-from zack@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C81F88FC26;
	Wed,  3 Aug 2011 18:50:19 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p73IoJ2g025307;
	Wed, 3 Aug 2011 18:50:19 GMT (envelope-from zack@svn.freebsd.org)
Received: (from zack@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p73IoJ9f025305;
	Wed, 3 Aug 2011 18:50:19 GMT (envelope-from zack@svn.freebsd.org)
Message-Id: <201108031850.p73IoJ9f025305@svn.freebsd.org>
From: Zack Kirsch <zack@FreeBSD.org>
Date: Wed, 3 Aug 2011 18:50:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r224637 - head/sys/fs/nfsserver
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Aug 2011 18:50:19 -0000

Author: zack
Date: Wed Aug  3 18:50:19 2011
New Revision: 224637
URL: http://svn.freebsd.org/changeset/base/224637

Log:
  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

Modified:
  head/sys/fs/nfsserver/nfs_nfsdserv.c

Modified: head/sys/fs/nfsserver/nfs_nfsdserv.c
==============================================================================
--- head/sys/fs/nfsserver/nfs_nfsdserv.c	Wed Aug  3 18:11:53 2011	(r224636)
+++ head/sys/fs/nfsserver/nfs_nfsdserv.c	Wed Aug  3 18:50:19 2011	(r224637)
@@ -620,7 +620,7 @@ nfsrvd_read(struct nfsrv_descript *nd, _
     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, _
 		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, _
 			*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;