summaryrefslogtreecommitdiffstats
path: root/module
diff options
context:
space:
mode:
authorBrian Behlendorf <[email protected]>2011-11-11 09:03:31 -0800
committerBrian Behlendorf <[email protected]>2011-11-11 09:18:28 -0800
commit1114ae6ae74a287478cd8a34770fc4a907f84134 (patch)
treed3752a329ba7f41f0be72ca2ff6e558b25b77fd2 /module
parent948914d2f10f6bf274bb51b96dd5337f01165b45 (diff)
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 <[email protected]> Closes #56
Diffstat (limited to 'module')
-rw-r--r--module/spl/spl-debug.c4
-rw-r--r--module/spl/spl-generic.c30
-rw-r--r--module/spl/spl-kstat.c4
-rw-r--r--module/spl/spl-proc.c4
-rw-r--r--module/spl/spl-tsd.c6
-rw-r--r--module/spl/spl-zlib.c6
6 files changed, 29 insertions, 25 deletions
diff --git a/module/spl/spl-debug.c b/module/spl/spl-debug.c
index 21e8c5d3d..0dbbb5a7c 100644
--- 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 3f042cc0d..e62e4a7a9 100644
--- 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 5be1c21fc..ee9dfdf03 100644
--- 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 1b353ceb2..745b10714 100644
--- 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 0581e1b2e..ce5560a1e 100644
--- 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 c42562f81..7bed00ca4 100644
--- 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);