From nobody Thu Feb 10 06:16:48 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 F00D719A1D38; Thu, 10 Feb 2022 06:16:48 +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 4JvRNJ6RM2z4kQq; Thu, 10 Feb 2022 06:16:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644473808; 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=Hh30D1InAE4vsO/LqQ2DBLf/QyAuNR0pXj0e3sg+4d8=; b=oZ1clcE40lWLKQWm2dj9coIrzCQhwh/4umN9aa4PWPCAOJn105Lg0I7d8WL0CRpQ7Ts5/k ECNOCj1MseJHGKDjBLtIeYbN5lxZj6WLoi9qogQbd5SlAUg1S4GtXnK/NF/AJCANXGog2d et+NDQzhWLoCx6Ii7n15ldbYzwMURv9kO6YP0a9+Fxdni+d81iJg7Rg2SI+V6lzI2jEi6d hQKJb1VD8XH9GtgJI6V+V1k9hDVO3rGdtVxeSxM/7kK4LArIhek00e8G3Pf8UIN4qlwwaA mCtmUFsLGWYjTnnJr3kkyMWOnYOMW7bB9uh4hZitMmM+SRGib/rMi57N+1h0Xw== 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 BCD861B5A6; Thu, 10 Feb 2022 06:16:48 +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 21A6Gmur048416; Thu, 10 Feb 2022 06:16:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21A6Gma6048415; Thu, 10 Feb 2022 06:16:48 GMT (envelope-from git) Date: Thu, 10 Feb 2022 06:16:48 GMT Message-Id: <202202100616.21A6Gma6048415@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: b9c92d631cfb - main - Annotate geom_md with MODULE_VERSION 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b9c92d631cfb06c12b0d2d9ad29a9f3f0b856237 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644473808; 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=Hh30D1InAE4vsO/LqQ2DBLf/QyAuNR0pXj0e3sg+4d8=; b=PHbff0fGc4tgRVRJdmtufI6D1YrF8zsKPnTlKagOnabhZTpNqs0psplmW3ip8XYqJbVfh/ OS88ukWGGwHfndUgl2CwmdHd73772r5SP0VxmFOY/eNb0nNhY792WHGSIj3KB+UhIT/n5t YdOhgn1ADZaj1sasHdR1QQ/MgmnWnrfaqcLHYz1m+S7V20MbTIk6YqBU+kUlax0PwIkEsH Z26+go9kbry34tV6L7vavfHlChi6DJJDaBZrWifUqt4yEQrZ9KWggPSWkXTT0gI4uRXB78 uXZEgzNwbhKJnvp9U+dK63BxjNh1mHhd9UwGUkF0+WoKcT1S9i4Q8o7DvozLNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644473808; a=rsa-sha256; cv=none; b=jp+fKWq/LbaY9j7QTa3V70S+XcyojeVqKAUcQZ875KpuTgJ3c8SkRjYIFCzDHamQi+UW2r TqsM8PgeOaAQ1aww0IZeBUuvrKwbxOToqYFNSkutKotfl8r6fGFGXIACHqTl2z7rjkOu+H OrQ8SElr4mphG+JDrgsetLNW9Xfb3k3JAUJ+6TEnLGNSenJOFFQ1T/l+HeoMPTZc9a/cNG mrj1jTLD3hwiCsxlmGD+wx4EbBLUSbS4YzIyqUNaFTpCs+GwdCXdK1RaU5TrDjp4jQqzKb peUPUgypgOk6VLIOkPleGRucm1Tr2Pp/7//5SFwc2H0nI+5KQWK7SWCVdbjUnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=b9c92d631cfb06c12b0d2d9ad29a9f3f0b856237 commit b9c92d631cfb06c12b0d2d9ad29a9f3f0b856237 Author: Kyle Evans AuthorDate: 2022-02-10 06:15:29 +0000 Commit: Kyle Evans CommitDate: 2022-02-10 06:16:19 +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. Reported by: re (cperciva) MFC after: 3 days --- 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 f88b82aacb78..bd83345d8e37 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);