spl-generic: bring up kstats subsystem before taskq

For spl-taskq to use the kstats infrastructure, it has to be available
first.

Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Tino Reichardt <milky-zfs@mcmilk.de>
Signed-off-by: Rob Norris <rob.norris@klarasystems.com>
Sponsored-by: Klara, Inc.
Sponsored-by: Syneto
Closes #16171

diff --git a/module/os/linux/spl/spl-generic.c b/module/os/linux/spl/spl-generic.c
index 986db15184562623621007ac10d5aff64ae89224..6ee0236d289a32a0df8c6985005bca1e18dfce5d 100644 (file)
--- a/module/os/linux/spl/spl-generic.c
+++ b/module/os/linux/spl/spl-generic.c
@@ -868,16 +868,16 @@ spl_init(void)
        if ((rc = spl_tsd_init()))
                goto out2;
 
-       if ((rc = spl_taskq_init()))
+       if ((rc = spl_proc_init()))
                goto out3;
 
-       if ((rc = spl_kmem_cache_init()))
+       if ((rc = spl_kstat_init()))
                goto out4;
 
-       if ((rc = spl_proc_init()))
+       if ((rc = spl_taskq_init()))
                goto out5;
 
-       if ((rc = spl_kstat_init()))
+       if ((rc = spl_kmem_cache_init()))
                goto out6;
 
        if ((rc = spl_zlib_init()))
@@ -891,13 +891,13 @@ spl_init(void)
 out8:
        spl_zlib_fini();
 out7:
-       spl_kstat_fini();
+       spl_kmem_cache_fini();
 out6:
-       spl_proc_fini();
+       spl_taskq_fini();
 out5:
-       spl_kmem_cache_fini();
+       spl_kstat_fini();
 out4:
-       spl_taskq_fini();
+       spl_proc_fini();
 out3:
        spl_tsd_fini();
 out2:
@@ -913,10 +913,10 @@ spl_fini(void)
 {
        spl_zone_fini();
        spl_zlib_fini();
-       spl_kstat_fini();
-       spl_proc_fini();
        spl_kmem_cache_fini();
        spl_taskq_fini();
+       spl_kstat_fini();
+       spl_proc_fini();
        spl_tsd_fini();
        spl_kvmem_fini();
        spl_random_fini();