d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Retire spl_module_init()/spl_module_fini()

Browse Source 
In the original implementation of the SPL wrappers were provided
for module initialization and cleanup.  This was done to abstract
away any compatibility code which might be needed for the SPL.

As it turned out the only significant compatibility issue was that
the default pwd during module load differed under Illumos and Linux.
Since this is such as minor thing and the wrappers complicate the
code they are being retired.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Issue zfsonlinux/zfs#2985
This commit is contained in:
Brian Behlendorf 2015-02-18 15:24:15 -08:00
parent 086476f920
commit c1bc8e610b
4 changed files with 8 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/Makefile.am
View File

@ -8,7 +8,6 @@ KERNEL_H = \
$(top_srcdir)/include/linux/list_compat.h \
$(top_srcdir)/include/linux/math64_compat.h \
$(top_srcdir)/include/linux/mm_compat.h \
$(top_srcdir)/include/linux/module_compat.h \
$(top_srcdir)/include/linux/proc_compat.h \
$(top_srcdir)/include/linux/rwsem_compat.h \
$(top_srcdir)/include/linux/wait_compat.h \

59
include/linux/module_compat.h
View File

@ -1,59 +0,0 @@
/*****************************************************************************\
* Copyright (C) 2007-2010 Lawrence Livermore National Security, LLC.
* Copyright (C) 2007 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Brian Behlendorf <behlendorf1@llnl.gov>.
* UCRL-CODE-235197
*
* This file is part of the SPL, Solaris Porting Layer.
* For details, see <http://zfsonlinux.org/>.
*
* The SPL is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version.
*
* The SPL is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*
* You should have received a copy of the GNU General Public License along
* with the SPL. If not, see <http://www.gnu.org/licenses/>.
\*****************************************************************************/
#ifndef _SPL_MODULE_COMPAT_H
#define _SPL_MODULE_COMPAT_H
#include <linux/module.h>
#define spl_module_init(init_fn) \
static int \
spl_##init_fn(void) \
{ \
int rc; \
\
spl_setup(); \
rc = init_fn(); \
\
return rc; \
} \
\
module_init(spl_##init_fn)
#define spl_module_exit(exit_fn) \
static void \
spl_##exit_fn(void) \
{ \
int rc; \
\
rc = exit_fn(); \
spl_cleanup(); \
if (rc) \
printk(KERN_ERR "SPL: Failure %d unloading " \
"dependent module\n", rc); \
} \
\
module_exit(spl_##exit_fn)
#endif /* _SPL_MODULE_COMPAT_H */

32
module/spl/spl-generic.c
View File

@ -518,8 +518,8 @@ spl_kvmem_fini(void)
spl_kmem_fini();
}
static int
__init spl_init(void)
static int __init
spl_init(void)
{
int rc = 0;
@ -575,10 +575,10 @@ __init spl_init(void)
"v%s-%s%s, rc = %d\n", SPL_META_VERSION, SPL_META_RELEASE,
SPL_DEBUG_STR, rc);
return rc;
return (rc);
}
static void
static void __exit
spl_fini(void)
{
printk(KERN_NOTICE "SPL: Unloaded module v%s-%s%s\n",
@ -594,30 +594,6 @@ spl_fini(void)
spl_kvmem_fini();
}
/* Called when a dependent module is loaded */
void
spl_setup(void)
{
int rc;
/*
* At module load time the pwd is set to '/' on a Solaris system.
* On a Linux system will be set to whatever directory the caller
* was in when executing insmod/modprobe.
*/
rc = vn_set_pwd("/");
if (rc)
printk("SPL: Warning unable to set pwd to '/': %d\n", rc);
}
EXPORT_SYMBOL(spl_setup);
/* Called when a dependent module is unloaded */
void
spl_cleanup(void)
{
}
EXPORT_SYMBOL(spl_cleanup);
module_init(spl_init);
module_exit(spl_fini);

11
module/splat/splat-ctl.c
View File

@ -50,7 +50,6 @@
#include <linux/fs.h>
#include <linux/miscdevice.h>
#include <linux/module.h>
#include <linux/module_compat.h>
#include <linux/slab.h>
#include <linux/uaccess.h>
#include <linux/vmalloc.h>
@ -600,7 +599,7 @@ static struct miscdevice splat_misc = {
.fops = &splat_fops,
};
static int
static int __init
splat_init(void)
{
int error;
@ -636,7 +635,7 @@ splat_init(void)
return (error);
}
static int
static void __exit
splat_fini(void)
{
int error;
@ -665,12 +664,10 @@ splat_fini(void)
ASSERT(list_empty(&splat_module_list));
printk(KERN_INFO "SPLAT: Unloaded module v%s-%s%s\n",
SPL_META_VERSION, SPL_META_RELEASE, SPL_DEBUG_STR);
return (0);
}
spl_module_init(splat_init);
spl_module_exit(splat_fini);
module_init(splat_init);
module_exit(splat_fini);
MODULE_DESCRIPTION("Solaris Porting LAyer Tests");
MODULE_AUTHOR(SPL_META_AUTHOR);