Date: Tue, 7 Oct 2014 15:12:06 +0000 (UTC) From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r272704 - projects/sendfile/sys/kern Message-ID: <201410071512.s97FC6Js041067@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glebius Date: Tue Oct 7 15:12:06 2014 New Revision: 272704 URL: https://svnweb.freebsd.org/changeset/base/272704 Log: uipc_ready() should not honor SBS_CANTRCVMORE. We already put the data in the peer's receive buffer. Sponsored by: Netflix Sponsored by: Nginx, Inc. Modified: projects/sendfile/sys/kern/uipc_usrreq.c Modified: projects/sendfile/sys/kern/uipc_usrreq.c ============================================================================== --- projects/sendfile/sys/kern/uipc_usrreq.c Tue Oct 7 14:34:41 2014 (r272703) +++ projects/sendfile/sys/kern/uipc_usrreq.c Tue Oct 7 15:12:06 2014 (r272704) @@ -1062,10 +1062,7 @@ uipc_ready(struct socket *so, struct mbu so2 = unp2->unp_socket; SOCKBUF_LOCK(&so2->so_rcv); - if (so2->so_rcv.sb_state & SBS_CANTRCVMORE) { - SOCKBUF_UNLOCK(&so2->so_rcv); - error = ENOTCONN; - } else if ((error = sbready(&so2->so_rcv, m, count)) == 0) + if ((error = sbready(&so2->so_rcv, m, count)) == 0) sorwakeup_locked(so2); else SOCKBUF_UNLOCK(&so2->so_rcv);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410071512.s97FC6Js041067>