From owner-svn-src-stable@freebsd.org Fri Apr 3 13:35:45 2020 Return-Path: Delivered-To: svn-src-stable@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1C7162A2E87; Fri, 3 Apr 2020 13:35:45 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48v1Ch11vMz43fK; Fri, 3 Apr 2020 13:35:44 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 606315279; Fri, 3 Apr 2020 13:25:54 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 033DPsXn080446; Fri, 3 Apr 2020 13:25:54 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 033DPr1c080445; Fri, 3 Apr 2020 13:25:53 GMT (envelope-from markj@FreeBSD.org) Message-Id: <202004031325.033DPr1c080445@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Fri, 3 Apr 2020 13:25:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r359592 - in stable/12/sys: kern sys X-SVN-Group: stable-12 X-SVN-Commit-Author: markj X-SVN-Commit-Paths: in stable/12/sys: kern sys X-SVN-Commit-Revision: 359592 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Apr 2020 13:35:45 -0000 Author: markj Date: Fri Apr 3 13:25:53 2020 New Revision: 359592 URL: https://svnweb.freebsd.org/changeset/base/359592 Log: MFC r359170: Remove UNP_NASCENT, reverting r303855. Modified: stable/12/sys/kern/uipc_usrreq.c stable/12/sys/sys/unpcb.h Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/kern/uipc_usrreq.c ============================================================================== --- stable/12/sys/kern/uipc_usrreq.c Fri Apr 3 13:05:26 2020 (r359591) +++ stable/12/sys/kern/uipc_usrreq.c Fri Apr 3 13:25:53 2020 (r359592) @@ -523,8 +523,6 @@ uipc_attach(struct socket *so, int proto, struct threa unp->unp_socket = so; so->so_pcb = unp; unp->unp_refcount = 1; - if (so->so_listen != NULL) - unp->unp_flags |= UNP_NASCENT; if ((locked = UNP_LINK_WOWNED()) == false) UNP_LINK_WLOCK(); @@ -796,9 +794,6 @@ uipc_detach(struct socket *so) UNP_PCB_UNLOCK(unp); goto restart; } - if ((unp->unp_flags & UNP_NASCENT) != 0) { - goto teardown; - } if ((vp = unp->unp_vnode) != NULL) { VOP_UNP_DETACH(vp); unp->unp_vnode = NULL; @@ -840,7 +835,6 @@ uipc_detach(struct socket *so) freeunp = unp_pcb_rele(unp); MPASS(freeunp == 0); local_unp_rights = unp_rights; -teardown: unp->unp_socket->so_pcb = NULL; saved_unp_addr = unp->unp_addr; unp->unp_addr = NULL; @@ -1682,7 +1676,6 @@ unp_connect2(struct socket *so, struct socket *so2, in if (so2->so_type != so->so_type) return (EPROTOTYPE); - unp2->unp_flags &= ~UNP_NASCENT; unp->unp_conn = unp2; unp_pcb_hold(unp2); unp_pcb_hold(unp); Modified: stable/12/sys/sys/unpcb.h ============================================================================== --- stable/12/sys/sys/unpcb.h Fri Apr 3 13:05:26 2020 (r359591) +++ stable/12/sys/sys/unpcb.h Fri Apr 3 13:25:53 2020 (r359592) @@ -108,7 +108,6 @@ struct unpcb { */ #define UNP_CONNECTING 0x010 /* Currently connecting. */ #define UNP_BINDING 0x020 /* Currently binding. */ -#define UNP_NASCENT 0x040 /* Newborn child socket. */ /* * Flags in unp_gcflag.