Skip to content

Commit

Permalink
spl-generic: bring up kstats subsystem before taskq
Browse files Browse the repository at this point in the history
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
  • Loading branch information
robn authored and behlendorf committed Aug 19, 2024
1 parent 06a7b12 commit f0ad031
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions module/os/linux/spl/spl-generic.c
Original file line number Diff line number Diff line change
Expand Up @@ -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()))
Expand All @@ -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:
Expand All @@ -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();
Expand Down

0 comments on commit f0ad031

Please sign in to comment.