Date: Tue, 25 Apr 2017 19:54:35 +0000 (UTC) From: Patrick Kelsey <pkelsey@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r317421 - head/sys/kern Message-ID: <201704251954.v3PJsZhY051984@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pkelsey Date: Tue Apr 25 19:54:34 2017 New Revision: 317421 URL: https://svnweb.freebsd.org/changeset/base/317421 Log: Remove unnecessary check for NULL mbuf in soreceive_generic(). This check has been redundant since it was introduced in r162554. Reviewed by: emaste, glebius MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D10322 Modified: head/sys/kern/uipc_socket.c Modified: head/sys/kern/uipc_socket.c ============================================================================== --- head/sys/kern/uipc_socket.c Tue Apr 25 19:48:25 2017 (r317420) +++ head/sys/kern/uipc_socket.c Tue Apr 25 19:54:34 2017 (r317421) @@ -1766,7 +1766,7 @@ dontblock: * requires MT_SONAME mbufs at the head of * each record. */ - if (m && pr->pr_flags & PR_ATOMIC && + if (pr->pr_flags & PR_ATOMIC && ((flags & MSG_PEEK) == 0)) (void)sbdroprecord_locked(&so->so_rcv); SOCKBUF_UNLOCK(&so->so_rcv);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201704251954.v3PJsZhY051984>