summaryrefslogtreecommitdiffstats
path: root/sys/nfsserver/nfs_srvsock.c
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>1998-05-31 18:00:46 +0000
committerpeter <peter@FreeBSD.org>1998-05-31 18:00:46 +0000
commit7f449d869996945e80ce542e76e8c3060430aecb (patch)
treed193348bed7749e085b9e697b1ec7d4d69026630 /sys/nfsserver/nfs_srvsock.c
parent7246bc51937eec415a80a48ce8b5149d5fe7c16d (diff)
downloadFreeBSD-src-7f449d869996945e80ce542e76e8c3060430aecb.zip
FreeBSD-src-7f449d869996945e80ce542e76e8c3060430aecb.tar.gz
Don't log zero length reads, this can happen during normal operation.
Obtained from: NetBSD
Diffstat (limited to 'sys/nfsserver/nfs_srvsock.c')
-rw-r--r--sys/nfsserver/nfs_srvsock.c10
1 files changed, 9 insertions, 1 deletions
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,
OpenPOWER on IntegriCloud