From nobody Tue Oct 29 15:50:08 2024 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 4XdF811373z5bcZW; Tue, 29 Oct 2024 15:50:09 +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 4XdF810JFXz4g6y; Tue, 29 Oct 2024 15:50:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730217009; 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=GVfWCUwwYyCWto0/XvIuKHqd27Ft3ytoTXxLJfifWRA=; b=rI/2ygkdHCsHgHwU5dhD8UqVW4K+MdbxiAuk9UYs4s3EVm6UsUfg645aEny3+Rl+MaQKSz olHuYQgVZOBRKtmF/yx4dIVwDM6bxRWgmxDZTDM8zWTinMC8B8XbjJ2DOJsd0bYsFQQYL0 AvI5XByvi5oa80ONMWkEJmZe+aUV4QSdN2E7Kzoiyncm6X6yST2vgjE8et/bxomfW9VH94 HyaTp60m2MMJFWsqkpAPjBcR8NsSBFHdJPezQthJsHBpcx4n6v+PHWZEjaJbNaPqhYsiQT rzv6mH2wOrUSOLd0Sp7dxGl7ANbNIjVvf+tpb9XxXK19WthpYXhlvU0/tTnYIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730217009; 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=GVfWCUwwYyCWto0/XvIuKHqd27Ft3ytoTXxLJfifWRA=; b=qYln2Cji7kJ+UrHT2uKIG0PNRK4hcmeTkAJd07mTrTMSqFea81kEEock7a5qBPB1lJ/oFI OGv08ToePDBOrHRkufyxdbNA/RKme6C6B9KjhXL1D4CyRygyNWvYCTv3OkSke20YK+v1CH ZmGYCVK/qtppfQHM6KJ/m5doK6Y4zf8A0CMNG+JQLXHgiEoInPNN4XPDWTuNoIX4D6rf9w oUPChgOUA3+kNysDiQGf8h28WlnsuigYfSRLZWf/S6ctIdZ9Yd5StDBWbR8ryYljuBMFyK jMBo1+70brzteGst0Qkq6GcOZqCt2lXfV61MsWVim98invQ15tHk942qpDE1SA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730217009; a=rsa-sha256; cv=none; b=C8+KcrAmPN32mfLQnRXqxvbgDxfOdNFtH++B77J9q2jjCmsyVH/RzlzTSpDxgOd6rbGfg8 XE8O0BG+KzD5KvjmWnVOGUsI7XoAHmGz0BngdoDu3tHw6pPdnhZTf1oQYRg4AzxA141vyz Zbe3F3XEoffJso5Z3NjMtEiAiTRkX6cpBYpvN7fACDEho2P4PAqYatSMJcQo7h11QNq3Bu 48iIvALjiDq0T47kpMiw3rssgyL2FW5p0m/8qLrAk75KyeHhzlmtUlNsBbSHq6sxDarieI cg3WY7xuWHzEaLJ9K+J6jjN+OsoLHVsbxu2MM265AUzg+u+8ajLPqGKssBhDWA== 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 4XdF8071kxzVSM; Tue, 29 Oct 2024 15:50:08 +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 49TFo8ah088406; Tue, 29 Oct 2024 15:50:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49TFo8Yx088402; Tue, 29 Oct 2024 15:50:08 GMT (envelope-from git) Date: Tue, 29 Oct 2024 15:50:08 GMT Message-Id: <202410291550.49TFo8Yx088402@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 2352336ad9b2 - main - geom_flashmap: Rename the kernel module 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 2352336ad9b26fd21d9b0013e195e41d6d02b914 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2352336ad9b26fd21d9b0013e195e41d6d02b914 commit 2352336ad9b26fd21d9b0013e195e41d6d02b914 Author: Mark Johnston AuthorDate: 2024-10-29 15:11:12 +0000 Commit: Mark Johnston CommitDate: 2024-10-29 15:11:12 +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 --- 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 92aa0af90542..5c1d11cfdcf5 100644 --- a/sys/dev/fdt/fdt_slicer.c +++ b/sys/dev/fdt/fdt_slicer.c @@ -179,5 +179,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 cd973e53802c..5b9cb93c7b31 100644 --- a/sys/dev/mmc/mmcsd.c +++ b/sys/dev/mmc/mmcsd.c @@ -1563,5 +1563,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 cef488d8b9b7..37fc7a36ecff 100644 --- a/sys/geom/geom_flashmap.c +++ b/sys/geom/geom_flashmap.c @@ -222,4 +222,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);