Prepend spl_ to all init/fini functions

This is a bit of cleanup I'd been meaning to get to for a while
to reduce the chance of a type conflict.  Well that conflict
finally occurred with the kstat_init() function which conflicts
with a function in the 2.6.32-6-pve kernel.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #56

diff --git a/include/linux/proc_compat.h b/include/linux/proc_compat.h
index 97d3c6c5a985bb1c618b452a1f7b4748c08136ed..3d8eda108aa707148402f51f4f491590488db1b4 100644 (file)
--- a/include/linux/proc_compat.h
+++ b/include/linux/proc_compat.h
@@ -47,7 +47,7 @@ struct proc_dir_entry *proc_dir_entry_find(struct proc_dir_entry *root,
                                           const char *str);
 int proc_dir_entries(struct proc_dir_entry *root);
 
-int proc_init(void);
-void proc_fini(void);
+int spl_proc_init(void);
+void spl_proc_fini(void);
 
 #endif /* SPL_PROC_H */

diff --git a/include/spl-debug.h b/include/spl-debug.h
index 8bd4c4495d21924f478b33478f6b5b70ec879648..1e08e77bc2032eb2d84806f0727d9bba0005b3bd 100644 (file)
--- a/include/spl-debug.h
+++ b/include/spl-debug.h
@@ -186,7 +186,7 @@ extern void spl_debug_dumpstack(struct task_struct *tsk);
 extern int spl_debug_clear_buffer(void);
 extern int spl_debug_mark_buffer(char *text);
 
-int debug_init(void);
-void debug_fini(void);
+int spl_debug_init(void);
+void spl_debug_fini(void);
 
 #endif /* SPL_DEBUG_INTERNAL_H */

diff --git a/include/sys/kstat.h b/include/sys/kstat.h
index 42458bee590cd823df618f18fde1757ca1ee69c4..3c2ad4c5ba068aace8fc4d05ff6e4f83f834d13e 100644 (file)
--- a/include/sys/kstat.h
+++ b/include/sys/kstat.h
@@ -146,8 +146,8 @@ typedef struct kstat_timer {
         hrtime_t     stop_time;            /* previous event stop time */
 } kstat_timer_t;
 
-int kstat_init(void);
-void kstat_fini(void);
+int spl_kstat_init(void);
+void spl_kstat_fini(void);
 
 extern kstat_t *__kstat_create(const char *ks_module, int ks_instance,
                             const char *ks_name, const char *ks_class,

diff --git a/include/sys/tsd.h b/include/sys/tsd.h
index 56f3b4cd86147db0f15857e16794b5dbda5adbd1..a31f60605897c90d67b25e146d1930076204d38c 100644 (file)
--- a/include/sys/tsd.h
+++ b/include/sys/tsd.h
@@ -39,7 +39,7 @@ extern void tsd_create(uint_t *, dtor_func_t);
 extern void tsd_destroy(uint_t *);
 extern void tsd_exit(void);
 
-int tsd_init(void);
-void tsd_fini(void);
+int spl_tsd_init(void);
+void spl_tsd_fini(void);
 
 #endif /* _SPL_TSD_H */

diff --git a/include/sys/zmod.h b/include/sys/zmod.h
index 246aa2aecc3823efbb9427f27d799d2b03441053..a6519dec220622253f5f0756f2070757777457f8 100644 (file)
--- a/include/sys/zmod.h
+++ b/include/sys/zmod.h
@@ -63,7 +63,7 @@ extern int z_compress_level(void *dest, size_t *destLen, const void *source,
 extern int z_uncompress(void *dest, size_t *destLen, const void *source,
     size_t sourceLen);
 
-int zlib_init(void);
-void zlib_fini(void);
+int spl_zlib_init(void);
+void spl_zlib_fini(void);
 
 #endif /* SPL_ZMOD_H */

diff --git a/module/spl/spl-debug.c b/module/spl/spl-debug.c
index 21e8c5d3df00f2a653b100119752438eaef4a3b5..0dbbb5a7cababc06e00d02fb7421b559543125cd 100644 (file)
--- a/module/spl/spl-debug.c
+++ b/module/spl/spl-debug.c
@@ -1176,7 +1176,7 @@ out:
 }
 
 int
-debug_init(void)
+spl_debug_init(void)
 {
         int rc, max = spl_debug_mb;
 
@@ -1244,7 +1244,7 @@ trace_fini(void)
 }
 
 void
-debug_fini(void)
+spl_debug_fini(void)
 {
         trace_fini();
 }

diff --git a/module/spl/spl-generic.c b/module/spl/spl-generic.c
index 3f042cc0dd8dc318998d7db3cbb5026281fbafa9..e62e4a7a98bc74e17ce2ef36d10514d481f73b9c 100644 (file)
--- a/module/spl/spl-generic.c
+++ b/module/spl/spl-generic.c
@@ -546,7 +546,7 @@ __init spl_init(void)
 {
        int rc = 0;
 
-       if ((rc = debug_init()))
+       if ((rc = spl_debug_init()))
                return rc;
 
        if ((rc = spl_kmem_init()))
@@ -564,16 +564,16 @@ __init spl_init(void)
        if ((rc = spl_vn_init()))
                SGOTO(out5, rc);
 
-       if ((rc = proc_init()))
+       if ((rc = spl_proc_init()))
                SGOTO(out6, rc);
 
-       if ((rc = kstat_init()))
+       if ((rc = spl_kstat_init()))
                SGOTO(out7, rc);
 
-       if ((rc = tsd_init()))
+       if ((rc = spl_tsd_init()))
                SGOTO(out8, rc);
 
-       if ((rc = zlib_init()))
+       if ((rc = spl_zlib_init()))
                SGOTO(out9, rc);
 
        /*
@@ -601,13 +601,13 @@ __init spl_init(void)
               SPL_META_VERSION, SPL_DEBUG_STR, (unsigned int) spl_hostid);
        SRETURN(rc);
 out10:
-       zlib_fini();
+       spl_zlib_fini();
 out9:
-       tsd_fini();
+       spl_tsd_fini();
 out8:
-       kstat_fini();
+       spl_kstat_fini();
 out7:
-       proc_fini();
+       spl_proc_fini();
 out6:
        spl_vn_fini();
 out5:
@@ -619,7 +619,7 @@ out3:
 out2:
        spl_kmem_fini();
 out1:
-       debug_fini();
+       spl_debug_fini();
 
        printk(KERN_NOTICE "SPL: Failed to Load Solaris Porting Layer v%s%s"
               ", rc = %d\n", SPL_META_VERSION, SPL_DEBUG_STR, rc);
@@ -633,16 +633,16 @@ spl_fini(void)
 
        printk(KERN_NOTICE "SPL: Unloaded module v%s%s\n",
               SPL_META_VERSION, SPL_DEBUG_STR);
-       zlib_fini();
-       tsd_fini();
-       kstat_fini();
-       proc_fini();
+       spl_zlib_fini();
+       spl_tsd_fini();
+       spl_kstat_fini();
+       spl_proc_fini();
        spl_vn_fini();
        spl_taskq_fini();
        spl_rw_fini();
        spl_mutex_fini();
        spl_kmem_fini();
-       debug_fini();
+       spl_debug_fini();
 }
 
 /* Called when a dependent module is loaded */

diff --git a/module/spl/spl-kstat.c b/module/spl/spl-kstat.c
index 5be1c21fc425a2195bb5f30cacc764eaf7104067..ee9dfdf0324522c15a1d2d94312035d111802935 100644 (file)
--- a/module/spl/spl-kstat.c
+++ b/module/spl/spl-kstat.c
@@ -477,7 +477,7 @@ __kstat_delete(kstat_t *ksp)
 EXPORT_SYMBOL(__kstat_delete);
 
 int
-kstat_init(void)
+spl_kstat_init(void)
 {
        SENTRY;
        spin_lock_init(&kstat_lock);
@@ -487,7 +487,7 @@ kstat_init(void)
 }
 
 void
-kstat_fini(void)
+spl_kstat_fini(void)
 {
        SENTRY;
        ASSERT(list_empty(&kstat_list));

diff --git a/module/spl/spl-proc.c b/module/spl/spl-proc.c
index 1b353ceb28fea3a2300f41899865fa9d1e9f6497..745b1071417f7458d2b82f1b36f6b6cbd65fe34b 100644 (file)
--- a/module/spl/spl-proc.c
+++ b/module/spl/spl-proc.c
@@ -1139,7 +1139,7 @@ proc_dir_entries(struct proc_dir_entry *root)
 }
 
 int
-proc_init(void)
+spl_proc_init(void)
 {
        int rc = 0;
         SENTRY;
@@ -1186,7 +1186,7 @@ out:
 }
 
 void
-proc_fini(void)
+spl_proc_fini(void)
 {
         SENTRY;
 

diff --git a/module/spl/spl-tsd.c b/module/spl/spl-tsd.c
index 0581e1b2e5fde8eacb7f519959ae4e5296124077..ce5560a1e347c58cf3c0ea6db81e8352745b570b 100644 (file)
--- a/module/spl/spl-tsd.c
+++ b/module/spl/spl-tsd.c
@@ -618,7 +618,8 @@ tsd_exit(void)
 }
 EXPORT_SYMBOL(tsd_exit);
 
-int tsd_init(void)
+int
+spl_tsd_init(void)
 {
        SENTRY;
 
@@ -629,7 +630,8 @@ int tsd_init(void)
        SRETURN(0);
 }
 
-void tsd_fini(void)
+void
+spl_tsd_fini(void)
 {
        SENTRY;
        tsd_hash_table_fini(tsd_hash_table);

diff --git a/module/spl/spl-zlib.c b/module/spl/spl-zlib.c
index c42562f8123a617bcc01986d92cdc75297df83f3..7bed00ca46495c90b57347fbfab50c25c3ccd8b9 100644 (file)
--- a/module/spl/spl-zlib.c
+++ b/module/spl/spl-zlib.c
@@ -196,7 +196,8 @@ z_uncompress(void *dest, size_t *destLen, const void *source, size_t sourceLen)
 }
 EXPORT_SYMBOL(z_uncompress);
 
-int zlib_init(void)
+int
+spl_zlib_init(void)
 {
        int size;
         SENTRY;
@@ -212,7 +213,8 @@ int zlib_init(void)
         SRETURN(0);
 }
 
-void zlib_fini(void)
+void
+spl_zlib_fini(void)
 {
         SENTRY;
        kmem_cache_destroy(zlib_workspace_cache);