diff options
| author | Brian Behlendorf <[email protected]> | 2015-02-18 15:39:05 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2015-02-24 11:37:44 -0800 |
| commit | b4f3666a16a61aa2ac7dca0b199e7ce51edbcd60 (patch) | |
| tree | 4ba07df5014ed7b83c71563b1d4e7b1138ee36cf /module/nvpair | |
| parent | 1efdc45ea805e61de2c54736cd1b2a4a5f48a913 (diff) | |
Retire spl_module_init()/spl_module_fini()
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 <[email protected]>
Closes #2985
Diffstat (limited to 'module/nvpair')
| -rw-r--r-- | module/nvpair/nvpair.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/module/nvpair/nvpair.c b/module/nvpair/nvpair.c index 9fd486bca..1eca0feea 100644 --- a/module/nvpair/nvpair.c +++ b/module/nvpair/nvpair.c @@ -3293,13 +3293,19 @@ nvs_xdr(nvstream_t *nvs, nvlist_t *nvl, char *buf, size_t *buflen) } #if defined(_KERNEL) && defined(HAVE_SPL) -#include <linux/module_compat.h> +static int __init +nvpair_init(void) +{ + return (0); +} -static int nvpair_init(void) { return 0; } -static int nvpair_fini(void) { return 0; } +static void __exit +nvpair_fini(void) +{ +} -spl_module_init(nvpair_init); -spl_module_exit(nvpair_fini); +module_init(nvpair_init); +module_exit(nvpair_fini); MODULE_DESCRIPTION("Generic name/value pair implementation"); MODULE_AUTHOR(ZFS_META_AUTHOR); |