git: 2fd8d2eb7bb9 - main - cuse: Actually use cuse_modevent()

The branch main has been updated by christos:

URL: https://cgit.FreeBSD.org/src/commit/?id=2fd8d2eb7bb91148169471291dbcfa499579b1bc

commit 2fd8d2eb7bb91148169471291dbcfa499579b1bc
Author:     Christos Margiolis <christos@FreeBSD.org>
AuthorDate: 2026-09-30 09:49:41 +0000
Commit:     Christos Margiolis <christos@FreeBSD.org>
CommitDate: 2026-09-30 09:49:41 +0000

    cuse: Actually use cuse_modevent()
    
    We can call cuse_kern_init()/cuse_kern_uninit() here, rather than using
    SYSINIT/SYSUNINIT.
    
    MFC after:      1 week
    Sponsored by:   The FreeBSD Foundation
    Reviewed by:    kib
    Differential Revision:  https://reviews.freebsd.org/D59862
---
 sys/fs/cuse/cuse.c | 63 ++++++++++++++++++++++++++++--------------------------
 1 file changed, 33 insertions(+), 30 deletions(-)

diff --git a/sys/fs/cuse/cuse.c b/sys/fs/cuse/cuse.c
index c6107b977dac..dd8eb4d67f80 100644
--- a/sys/fs/cuse/cuse.c
+++ b/sys/fs/cuse/cuse.c
@@ -74,32 +74,6 @@
 #error "PAGE_SIZE is too big!"
 #endif
 
-static int
-cuse_modevent(module_t mod, int type, void *data)
-{
-	switch (type) {
-	case MOD_LOAD:
-	case MOD_UNLOAD:
-		return (0);
-	default:
-		return (EOPNOTSUPP);
-	}
-}
-
-static moduledata_t cuse_mod = {
-	.name = "cuse",
-	.evhand = &cuse_modevent,
-};
-
-DECLARE_MODULE(cuse, cuse_mod, SI_SUB_DEVFS, SI_ORDER_FIRST);
-MODULE_VERSION(cuse, 1);
-
-/*
- * Prevent cuse4bsd.ko and cuse.ko from loading at the same time by
- * declaring support for the cuse4bsd interface in cuse.ko:
- */
-MODULE_VERSION(cuse4bsd, 1);
-
 #ifdef FEATURE
 FEATURE(cuse, "Userspace character devices");
 #endif
@@ -295,7 +269,7 @@ cuse_cmd_unlock(struct cuse_client_command *pccmd)
 }
 
 static void
-cuse_kern_init(void *arg)
+cuse_kern_init(void)
 {
 	TAILQ_INIT(&cuse_server_head);
 
@@ -308,10 +282,9 @@ cuse_kern_init(void *arg)
 	    (CUSE_VERSION >> 16) & 0xFF, (CUSE_VERSION >> 8) & 0xFF,
 	    (CUSE_VERSION >> 0) & 0xFF);
 }
-SYSINIT(cuse_kern_init, SI_SUB_DEVFS, SI_ORDER_ANY, cuse_kern_init, NULL);
 
 static void
-cuse_kern_uninit(void *arg)
+cuse_kern_uninit(void)
 {
 	void *ptr;
 
@@ -334,7 +307,6 @@ cuse_kern_uninit(void *arg)
 
 	mtx_destroy(&cuse_global_mtx);
 }
-SYSUNINIT(cuse_kern_uninit, SI_SUB_DEVFS, SI_ORDER_ANY, cuse_kern_uninit, NULL);
 
 static int
 cuse_server_get(struct cuse_server **ppcs)
@@ -2062,3 +2034,34 @@ cuse_client_kqfilter(struct cdev *dev, struct knote *kn)
 		cuse_client_kqfilter_poll(dev, pcc);
 	return (error);
 }
+
+static int
+cuse_modevent(module_t mod, int type, void *data)
+{
+	switch (type) {
+	case MOD_LOAD:
+		cuse_kern_init();
+		break;
+	case MOD_UNLOAD:
+		cuse_kern_uninit();
+		break;
+	default:
+		return (EOPNOTSUPP);
+	}
+
+	return (0);
+}
+
+static moduledata_t cuse_mod = {
+	.name = "cuse",
+	.evhand = &cuse_modevent,
+};
+
+DECLARE_MODULE(cuse, cuse_mod, SI_SUB_DEVFS, SI_ORDER_FIRST);
+MODULE_VERSION(cuse, 1);
+
+/*
+ * Prevent cuse4bsd.ko and cuse.ko from loading at the same time by
+ * declaring support for the cuse4bsd interface in cuse.ko:
+ */
+MODULE_VERSION(cuse4bsd, 1);