From nobody Tue Feb 28 02:03:48 2023 X-Original-To: dev-commits-src-branches@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 4PQgdd30PTz3tl9J; Tue, 28 Feb 2023 02:03:49 +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 4PQgdd1KKmz4JqJ; Tue, 28 Feb 2023 02:03:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677549829; 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=AsnGgCJnlJROG2xPVBe9KCz7+2hBCOn2Lc1kU2BwR+U=; b=HjJ9nObHGrPppX73J+NMJNp5jnZNr1vtLIDNkIefR3gUiWIjCSuSJKSS3/Y0nECwfxBKaA fjaaPQnI3Xsriugf3qRkWjkSPYfe3gJKTFeud6HyasLMDaKTT9tSJuz06jVJTHiVAnZuf4 YSArzQ6claBZTRUjdugJc6XOMmOS8qEQT3u+E12itZCBR1wVeoWa2n1QXiiFNJlbgL9853 hGcFY///z8gq+mB+ug8ErKUYYxvn/f8fc2/HFkSM9iaUP+hH6lUPMr8Uj/1qQ8cbIz4EDE CDNmuYUrbLB2zlRIdZ+jrrKphsPsZDi/8SuK5vBhPKFXpBJboqHcamtu4ymC5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677549829; 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=AsnGgCJnlJROG2xPVBe9KCz7+2hBCOn2Lc1kU2BwR+U=; b=N2OIh/YPk14HIE8T5QvQGto/ACukTMIaaAobsXudl+ddeIpj6HycH7rxmvyMAPQtegh0tt MlRtHGcCM85ELHrpzVlEW8DGmndR73cO4TbJGGxDxKUsN2/oCjMzIZQGb8Wqk4kp2nfQ2a W0Eufqf65Bp6s+4oFDmJU6FBUmk0Ch1HjvupkHpZ4K/be+G+iTBN3+stTRQxd/w3zcSVc+ lYMnmz/8ZltXIqJrBUftlWz+l6/hnwqRbaxnpropVkR6xOgoM6E9gzXWga+KllYLdhblDg ZsQZnEUaeswViHFOXi3I36SpbDYog+WbkjaZUg+1EUIaV3ZtB3rXtI/1oSOSWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677549829; a=rsa-sha256; cv=none; b=rRfiYYYhKzFTXUUpF1qK8GQHG9Iht3zbbiD6soi9PDG4pheCKwl2TP8MnRzSkph2lFzLgB jaBEkK7GTR1h6KTigx3djX4sRGhy4XJ3zdlRlC01xuCkr2E0rzEjIZzLEKW6b7c2smKYG6 gYRSvpR8rUJRylv86n94GuOsE48+8TVE47GVj67udQ9CZ/GyzY7T8ZZTHfTZ86SMNlRYIh Bh7HPHKZQo3xv+ZJYAYnMupVrXtkAXklRlnO834dZ9szpUEIFc/9gmKpBZmsGWNRmVm4gj IcsFEu9yJx9k36dmeki7X6Ekggy6T8LjV01ohxVlaqVp4lO4an4rVn6kf6koEA== 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 4PQgdd0R6vzpsT; Tue, 28 Feb 2023 02:03:49 +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 31S23mGL007320; Tue, 28 Feb 2023 02:03:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31S23m1r007319; Tue, 28 Feb 2023 02:03:48 GMT (envelope-from git) Date: Tue, 28 Feb 2023 02:03:48 GMT Message-Id: <202302280203.31S23m1r007319@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 78c22dde834a - stable/12 - vnet: Make vnet_sys[un]init() static List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 78c22dde834a99302e746262fd5440713cc55fcd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=78c22dde834a99302e746262fd5440713cc55fcd commit 78c22dde834a99302e746262fd5440713cc55fcd Author: Zhenlei Huang AuthorDate: 2023-02-21 16:22:23 +0000 Commit: Zhenlei Huang CommitDate: 2023-02-28 02:02:17 +0000 vnet: Make vnet_sys[un]init() static These two functions are intended to be used only when allocating or destroying vnet instances. No functional change intended. Reviewed by: kp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D37955 (cherry picked from commit fb9b76e05247e014f5faa554161028f6aa409bfd) (cherry picked from commit 7b6d9cae9760152f0994d0825ee49cb5b5e204dc) --- sys/net/vnet.c | 10 ++++++++-- sys/net/vnet.h | 6 ------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sys/net/vnet.c b/sys/net/vnet.c index 3fd423d22d1d..0c8755990520 100644 --- a/sys/net/vnet.c +++ b/sys/net/vnet.c @@ -220,6 +220,12 @@ SDT_PROBE_DEFINE2(vnet, functions, vnet_destroy, entry, SDT_PROBE_DEFINE1(vnet, functions, vnet_destroy, return, "int"); +/* + * Run per-vnet sysinits or sysuninits during vnet creation/destruction. + */ +static void vnet_sysinit(void); +static void vnet_sysuninit(void); + #ifdef DDB static void db_show_vnet_print_vs(struct vnet_sysinit *, int); #endif @@ -569,7 +575,7 @@ vnet_deregister_sysuninit(void *arg) * vnet construction. The caller is responsible for ensuring the new vnet is * the current vnet and that the vnet_sysinit_sxlock lock is locked. */ -void +static void vnet_sysinit(void) { struct vnet_sysinit *vs; @@ -587,7 +593,7 @@ vnet_sysinit(void) * vnet destruction. The caller is responsible for ensuring the dying vnet * the current vnet and that the vnet_sysinit_sxlock lock is locked. */ -void +static void vnet_sysuninit(void) { struct vnet_sysinit *vs; diff --git a/sys/net/vnet.h b/sys/net/vnet.h index 2d69a8a96633..034c120f0dd0 100644 --- a/sys/net/vnet.h +++ b/sys/net/vnet.h @@ -352,12 +352,6 @@ struct vnet_sysinit { SYSUNINIT(vnet_uninit_ ## ident, subsystem, order, \ vnet_deregister_sysuninit, &ident ## _vnet_uninit) -/* - * Run per-vnet sysinits or sysuninits during vnet creation/destruction. - */ -void vnet_sysinit(void); -void vnet_sysuninit(void); - /* * Interfaces for managing per-vnet constructors and destructors. */