diff options
| author | Charles Longeau <chl@cvs.openbsd.org> | 2007-12-20 17:16:51 +0000 |
|---|---|---|
| committer | Charles Longeau <chl@cvs.openbsd.org> | 2007-12-20 17:16:51 +0000 |
| commit | dee72f1e6a5d45c4b5f5c1906edeb7daa96f78e5 (patch) | |
| tree | 22aa1176e8ef17347edfc7db17412bd4c33d4d91 | |
| parent | 59addf3f2cac6e5d34e1b468839a462b36206b79 (diff) | |
Remove an obsolete nfs kludge, spotted by Frank Denis (many thanks), also there in NetBSD and FreeBSD trees.
Tested by thib@ who found that it shaved 18min wall clock time of coping a 20G file.
Been in snaps for some time
"looks ok" markus@ "makes sense" blambert@ ok claudio@ thib@
| -rw-r--r-- | sys/kern/uipc_socket.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 4b815e0c378..c79d828130f 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_socket.c,v 1.66 2007/02/26 23:53:33 kurt Exp $ */ +/* $OpenBSD: uipc_socket.c,v 1.67 2007/12/20 17:16:50 chl Exp $ */ /* $NetBSD: uipc_socket.c,v 1.21 1996/02/04 02:17:52 christos Exp $ */ /* @@ -424,7 +424,7 @@ restart: if ((atomic && resid > so->so_snd.sb_hiwat) || clen > so->so_snd.sb_hiwat) snderr(EMSGSIZE); - if (space < resid + clen && uio && + if (space < resid + clen && (atomic || space < so->so_snd.sb_lowat || space < clen)) { if (so->so_state & SS_NBIO) snderr(EWOULDBLOCK); |