From nobody Wed Dec 07 17:57:07 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NS4jv1vQ8z4jQB0; Wed, 7 Dec 2022 17:57:07 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NS4jv1PClz4Jj6; Wed, 7 Dec 2022 17:57:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670435827; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bhW2LPjbUIehnRUR1f79hQlduLJsz+kLlct1oEukJG0=; b=WUnwdf9kskc6kSy9ruJ7duHE5/GDyrv6Ju4Uk52HT6pW4Us+2WMaK8YGLh21n237tLzDPY +Dq1e0+hT+GzV6/PLrhQw2pTwnDWLGgWqCR50dkmck+KhQlR9O4TltqbYLdn32q6jq1na5 xFO+e1AMu4D2Xb8GOieGtQOVDgYxvXebriSwU/V95T0AbwB2vSwg5exJchCPGUHnNeXhFh wAKA5MWAg71lTKSj3cGuUmNoeUnRTiIr4x/Mdzk3bseHbvW/DuZNktzXR0KUUzDILg7nq4 YhVj6Ir1PyS8Lqn6d3XzAiP4YUnrscztb+b77zDvoRFfHiolyy0s2y8otmtgwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670435827; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bhW2LPjbUIehnRUR1f79hQlduLJsz+kLlct1oEukJG0=; b=KumMutbxBKMc5hLEf6ffmM+aKCwLAqALkeftYIfYqm04EnXHEv71OxuXbAgakyyC++N9dD WlcJCIfJO0ai2FNmKwFLmNXg4CFLP+rLktty+CZ1DRgMSMCO/FsCTSrJUMPPn2dYnMyTO1 aJUnUWsA3xQWLrkClPuK7OAXtkhYhi0+TmrS0dJ+JXcollhH775AohPKeufRThjfN8dhmW wmUkGj2MlTCM0m0F5sDBi3r/tlxXsIGgcoUJmsQEpcWLgIVaogBrlH5ca9Nx2HlnGlC1dB iiA1wpBPzHZwNvdmfPHOEYjAqtUeMwIewFl6OKvyW32sgr0TM7uN+UbwLlsFwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670435827; a=rsa-sha256; cv=none; b=brjPaq/soa41tksYd/SVvf/5Oedo2PdPdDHmT7WTAhOy/IAhAN3BQDrCLp2g89+8m2cb/I jepgf6RDxd8C+76bqqaWtNhlYiL7302F5aM+QTA8sONW75bUcrA/nGvbrDok0y8Mta4veP EbKt/CKJP40kkd6hYaTooQGHk3oTuGxpkzM/lSx4VFUiehEf6a1IPqWCp/p1St80p/K7So NVH9vmeWOX5+W8wg6Fogche/E/VhkcMAhv9JBJ05vQoWdks4fcBPK+1GjsqWSLArP2aUio PPP3YsesH6DBWTyePNLiegYFTj1yyHIge/djVN9V81mzILyVMJkyt06k4wSGhg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NS4jv0RgJzQq1; Wed, 7 Dec 2022 17:57:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2B7Hv76r057591; Wed, 7 Dec 2022 17:57:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B7Hv7q2057590; Wed, 7 Dec 2022 17:57:07 GMT (envelope-from git) Date: Wed, 7 Dec 2022 17:57:07 GMT Message-Id: <202212071757.2B7Hv7q2057590@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 294a609fc07d - main - udp: destroy UDP and UDP-Lite inpcbinfos in single SYSUNINIT List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 294a609fc07d5cf26ee430b0015d9846b81c8e5c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=294a609fc07d5cf26ee430b0015d9846b81c8e5c commit 294a609fc07d5cf26ee430b0015d9846b81c8e5c Author: Gleb Smirnoff AuthorDate: 2022-12-07 17:55:38 +0000 Commit: Gleb Smirnoff CommitDate: 2022-12-07 17:55:38 +0000 udp: destroy UDP and UDP-Lite inpcbinfos in single SYSUNINIT They are created in a single SYSINIT, there is no reason to destroy them in separate functions. --- sys/netinet/udp_usrreq.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index 5110d63e1092..e8aaf1f11134 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -237,18 +237,10 @@ udp_destroy(void *unused __unused) { in_pcbinfo_destroy(&V_udbinfo); + in_pcbinfo_destroy(&V_ulitecbinfo); uma_zdestroy(V_udpcb_zone); } VNET_SYSUNINIT(udp, SI_SUB_PROTO_DOMAIN, SI_ORDER_FOURTH, udp_destroy, NULL); - -static void -udplite_destroy(void *unused __unused) -{ - - in_pcbinfo_destroy(&V_ulitecbinfo); -} -VNET_SYSUNINIT(udplite, SI_SUB_PROTO_DOMAIN, SI_ORDER_FOURTH, udplite_destroy, - NULL); #endif #ifdef INET