From 7f449d869996945e80ce542e76e8c3060430aecb Mon Sep 17 00:00:00 2001
From: peter <peter@FreeBSD.org>
Date: Sun, 31 May 1998 18:00:46 +0000
Subject: Don't log zero length reads, this can happen during normal operation.

Obtained from: NetBSD
---
 sys/nfsserver/nfs_srvsock.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'sys/nfsserver')

diff --git a/sys/nfsserver/nfs_srvsock.c b/sys/nfsserver/nfs_srvsock.c
index d9dcbbc..eadada0 100644
--- a/sys/nfsserver/nfs_srvsock.c
+++ b/sys/nfsserver/nfs_srvsock.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_socket.c	8.5 (Berkeley) 3/30/95
- * $Id: nfs_socket.c,v 1.33 1998/05/31 17:27:49 peter Exp $
+ * $Id: nfs_socket.c,v 1.34 1998/05/31 17:57:43 peter Exp $
  */
 
 /*
@@ -550,6 +550,13 @@ tryagain:
 			   }
 			} while (error == EWOULDBLOCK);
 			if (!error && auio.uio_resid > 0) {
+			    /*
+			     * Don't log a 0 byte receive; it means
+			     * that the socket has been closed, and
+			     * can happen during normal operation
+			     * (forcible unmount or Solaris server).
+			     */
+			    if (auio.uio_resid != sizeof (u_int32_t))
 			    log(LOG_INFO,
 				 "short receive (%d/%d) from nfs server %s\n",
 				 sizeof(u_long) - auio.uio_resid,
@@ -581,6 +588,7 @@ tryagain:
 			} while (error == EWOULDBLOCK || error == EINTR ||
 				 error == ERESTART);
 			if (!error && auio.uio_resid > 0) {
+			    if (len != auio.uio_resid)
 			    log(LOG_INFO,
 				"short receive (%d/%d) from nfs server %s\n",
 				len - auio.uio_resid, len,
-- 
cgit v1.1