From nobody Sat Feb 12 16:47:15 2022 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 C20791948550; Sat, 12 Feb 2022 16:47:15 +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 4JwxGq4jd7z4lqS; Sat, 12 Feb 2022 16:47:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644684435; 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=lU4LVRxfzotInRITam0FEd8tsC4e4CO/kFWo35mt3ig=; b=EXk5rNg3LHQNcDBRMJzbS2C4H98TErHyHSw+6yikvkbPW+SfcQOG7Ztr4gyT2twGGP1Pc/ 5WxzAmlvkZERvM6qw7C+J1Xv62FIVIuF6+myufv/Hd6NxnZgeFrwjT+jXQjYwGAJLBm0Pw Ye+pqPxmCAUC/dCxlNvxRgCjW7AbXar9cS0VvQybazzxbdtu6in8/og38ZH+ESGAf9nDhs RxDTCrprEfy2qr6tHCUsCBYSiawAPSFfRsVtyMteW4e85uj7hAEdhmFOyIXts85W3cSi/A lrL0+3rhDgQM9r0k02xcXxI0zrSW+/SZ8wL0Wd+OLwlSLgF57j3IPiMZqK/VJw== 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 7E9CE3303; Sat, 12 Feb 2022 16:47:15 +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 21CGlFpK042451; Sat, 12 Feb 2022 16:47:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21CGlFSr042450; Sat, 12 Feb 2022 16:47:15 GMT (envelope-from git) Date: Sat, 12 Feb 2022 16:47:15 GMT Message-Id: <202202121647.21CGlFSr042450@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: b36a4ee6687b - stable/12 - Annotate geom_md with MODULE_VERSION 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: b36a4ee6687b1407a6eeceda7d33e85d4b72a130 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644684435; 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=lU4LVRxfzotInRITam0FEd8tsC4e4CO/kFWo35mt3ig=; b=FyHPV4/jsZtgHYr5EtZhEbqXc5/KWzp7gC/z33hhfGn3FD3jfa/AZyDbBoq4hJm4r8DrvA 6cCSzR5Fce58G+dvEOuKxrTqkPnVpW8r/18SPWJziZyy5yTot0s/3Dlm9r+zLqZsy3UsHq 7J/Hn4Msz+6Rnz2/oRjLgNYMaOzpm53tkqMzBA8bz/1t1+NG+ATRCT36/LT3jPduUMa41y fW6Mo2yK7LlFwvFnrOnz6OvEzcM/Ad1Z+3Z/An5LRJGMASHZzuoKDNGwHSI4+AdG/lt5mL qvUT6dcaOuRmoTPDP4is2lcMhcce1tTBF6JDR5rS06ywy3N+tR33nokoiSjVgA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644684435; a=rsa-sha256; cv=none; b=qX1ZOSQ9YCeRI5unlymOzwDMzSNmbwIjJwcxpwS0N1YmwLbytcJ7z4mwGn71ZbQZ1v0RFJ ynKD/iQG0JstRmMKc/hWn7J5wvafp660JN+KdUQgAVHjsnAOZAKeg3NSiNSgsnE8i/uca8 LE98PAQ8INwR/5Wek9Xebh6ZVnxIirvezbFDGf+K9R5OwYYTMUkXWJkRUer4/MPngNe+KR 51jhHC5SfueQkRkDzktgu7o3f80m2DUznRtk9FW9RsHztIkOk3GUdA9XAV68AKUUsknRkH VrvC89vDGGiXNtjjJUq9Bw0nFenXACooJtvu+ij6tVIw8XHQLoRYKPcieOVrbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=b36a4ee6687b1407a6eeceda7d33e85d4b72a130 commit b36a4ee6687b1407a6eeceda7d33e85d4b72a130 Author: Kyle Evans AuthorDate: 2022-02-10 06:15:29 +0000 Commit: Kyle Evans CommitDate: 2022-02-12 16:46:41 +0000 Annotate geom_md with MODULE_VERSION This was missed in 74d6c131cbe2 where other geom modules were annotated with MODULE_VERSION. Again, the problem is the same: we can't detect that geom_md is loaded into the kernel without it. This was noticed in release builds on the cluster; mdconfig attempts to load geom_md because it can't detect it in the kernel, but the cluster config includes md(4) and does not build the kmod. This problem would have been masked on hosts with the kmod built, as the kmod attempts to register the g_md module and fails. With this commit, mdconfig would not even try to load it again. (cherry picked from commit b9c92d631cfb06c12b0d2d9ad29a9f3f0b856237) --- sys/dev/md/md.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/md/md.c b/sys/dev/md/md.c index 9e795a4a933b..641dff4f45d3 100644 --- a/sys/dev/md/md.c +++ b/sys/dev/md/md.c @@ -224,6 +224,7 @@ struct g_class g_md_class = { }; DECLARE_GEOM_CLASS(g_md_class, g_md); +MODULE_VERSION(geom_md, 0); static LIST_HEAD(, md_s) md_softc_list = LIST_HEAD_INITIALIZER(md_softc_list);