git: 26d85a5aba34 - stable/14 - geom_flashmap: Rename the kernel module

The branch stable/14 has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=26d85a5aba3439092e73dfe33234a5687d5c70b9

commit 26d85a5aba3439092e73dfe33234a5687d5c70b9
Author:     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2024-10-29 15:11:12 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
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);