From nobody Tue Nov 05 14:29:55 2024 X-Original-To: dev-commits-src-all@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 4XjW2C5MzLz5c9s4; Tue, 05 Nov 2024 14:29:55 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XjW2C4Zhxz54lH; Tue, 5 Nov 2024 14:29:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730816995; 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=IN6TaZjW1Zo9/w/g4LKVeYf7V809Dsj+0qGozEJ7pHc=; b=lTwf7uDOB8WcttHFw924qxwE7gNh+9vu96hBbEDjjiZCAzU500/UJ3Hu01ITkyg8e4QNAG gPB2OaihVMKORjbD7cIgYMqRjyaIFIt5+4+5L/+bIWGtmdemds7bjVdVJl4cTdssg6pF63 npjqAZVLhuFx1knPhN4biEwmL8oHCAKyfER0p3dKWrxx2IqmBW+EXpQFWk0q1cCSTpo4Ew 0jcQh1sxWlJv1gxnNEYw6682O+pJh5Us6nRqnhCMSbJR2XlI1S8dNsHmKNXKtEXB2iR/Tl 1rijk9Hkj4XKyNoORRBfwjw9mNG8xyY+12nho0nOBItOnaNWsc9dHJ8G8OfFSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730816995; 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=IN6TaZjW1Zo9/w/g4LKVeYf7V809Dsj+0qGozEJ7pHc=; b=YwLcXGO6kEtPVe1Tx5dMLRQxdmdQoCmLS/HyKEHlbVCiCVznOK4dSNVe97fjF8Bjc/gAyz qpTnCjhUozXxu4toAc8CJIGB0PS9+TVeCM0SrlCGrN5A2d+kA8KVczr0wrs0dYn+tXDbu/ CmI+DT0iuus8r6XXxC9YrHxjz5Z7xw9boFQxztHpsBtCC6pJY1ZEfPRHZDC4gOzq2im3L/ 8THpD47Yv/SOtFVCD0LfmMF2EAP843EgkxnPyZmLIO53QMXiPUBJbpPcNFwXq1+d2Cuicc GCmkAEjAtVzulnp8fIasrWdgFyBvywCCM66NV+e4d3Ir6FceTEAETZoS222NFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730816995; a=rsa-sha256; cv=none; b=HN+RXmRWJaoU3GEhF3eqdcjjGDhBv9FzmPWNb+kb6S4CqEBCTOoge2fKyH78x+pLK4jQto iPH04u3X0XvSxzvDGXTsT4XLwrGNo2ZoErxrN/ApYWVhTYxcZNLrH1EemcqE7OlsCm2vLa rYSX75r7VZisJVJOnOBR1kut0HAa8PvTl5HMGYpy7jX0tEnbko9uWTTHBiBXvUnVL8KEoJ +px3m+gAykwfqk6SaAUG07Jfg+R92N2+9vwVQa/KPkDNPtcyodQgSUGAOK5nrJQ9/GFyjn GtdMeDRVQU2Ay60tDl7ABYfjHWB4kQo1nBPJhcxdPTjiCOo12avkk0kpfXcG6w== 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 4XjW2C4BXVzLXW; Tue, 5 Nov 2024 14:29:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A5ETtU8080878; Tue, 5 Nov 2024 14:29:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A5ETtNn080875; Tue, 5 Nov 2024 14:29:55 GMT (envelope-from git) Date: Tue, 5 Nov 2024 14:29:55 GMT Message-Id: <202411051429.4A5ETtNn080875@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 26d85a5aba34 - stable/14 - geom_flashmap: Rename the kernel module List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 26d85a5aba3439092e73dfe33234a5687d5c70b9 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=26d85a5aba3439092e73dfe33234a5687d5c70b9 commit 26d85a5aba3439092e73dfe33234a5687d5c70b9 Author: Mark Johnston AuthorDate: 2024-10-29 15:11:12 +0000 Commit: Mark Johnston CommitDate: 2024-11-05 00:55:43 +0000 geom_flashmap: Rename the kernel module Absent a linker.hints, if a module dependency exists on disk, the loader will automatically load it. That is, if something depends on module foo, and foo.ko exists, we'll load foo.ko even though the linker hints file is missing. It's a bit of a hack but it's handy. This breaks with geom_flashmap though, since it's geom_flashmap.ko on disk but the module is called g_flashmap. However, pretty much every other GEOM module is given a "geom_" prefix, so for consistency's sake alone, it seems nice to rename the module. PR: 274388 Reviewed by: jhb MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D47311 (cherry picked from commit 2352336ad9b26fd21d9b0013e195e41d6d02b914) --- sys/dev/fdt/fdt_slicer.c | 2 +- sys/dev/mmc/mmcsd.c | 2 +- sys/geom/geom_flashmap.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/fdt/fdt_slicer.c b/sys/dev/fdt/fdt_slicer.c index 70cad004b7b6..acc08fa84cbb 100644 --- a/sys/dev/fdt/fdt_slicer.c +++ b/sys/dev/fdt/fdt_slicer.c @@ -180,5 +180,5 @@ static moduledata_t fdt_slicer_mod = { }; DECLARE_MODULE(fdt_slicer, fdt_slicer_mod, SI_SUB_DRIVERS, SI_ORDER_THIRD); -MODULE_DEPEND(fdt_slicer, g_flashmap, 0, 0, 0); +MODULE_DEPEND(fdt_slicer, geom_flashmap, 0, 0, 0); MODULE_VERSION(fdt_slicer, 1); diff --git a/sys/dev/mmc/mmcsd.c b/sys/dev/mmc/mmcsd.c index 9bc50124592d..3e4059ae43a6 100644 --- a/sys/dev/mmc/mmcsd.c +++ b/sys/dev/mmc/mmcsd.c @@ -1564,5 +1564,5 @@ mmcsd_handler(module_t mod __unused, int what, void *arg __unused) } DRIVER_MODULE(mmcsd, mmc, mmcsd_driver, mmcsd_handler, NULL); -MODULE_DEPEND(mmcsd, g_flashmap, 0, 0, 0); +MODULE_DEPEND(mmcsd, geom_flashmap, 0, 0, 0); MMC_DEPEND(mmcsd); diff --git a/sys/geom/geom_flashmap.c b/sys/geom/geom_flashmap.c index 6dde6d271d33..c00d7d33c638 100644 --- a/sys/geom/geom_flashmap.c +++ b/sys/geom/geom_flashmap.c @@ -223,4 +223,4 @@ static struct g_class g_flashmap_class = { }; DECLARE_GEOM_CLASS(g_flashmap_class, g_flashmap); -MODULE_VERSION(g_flashmap, 0); +MODULE_VERSION(geom_flashmap, 0);