diff options
| author | Brian Behlendorf <[email protected]> | 2015-02-18 15:24:15 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2015-02-27 13:43:39 -0800 |
| commit | c1bc8e610be8bf1cc8170f788a89a9ee257eb51f (patch) | |
| tree | 1500d76f5534ba22388e2bc73fe2fc52d2cbf164 /include | |
| parent | 086476f92005506cb07e75f889e8ddb69026e842 (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]>
Issue zfsonlinux/zfs#2985
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/Makefile.am | 1 | ||||
| -rw-r--r-- | include/linux/module_compat.h | 59 |
2 files changed, 0 insertions, 60 deletions
diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am index 1cca44a2b..712e94ebe 100644 --- a/include/linux/Makefile.am +++ b/include/linux/Makefile.am @@ -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 \ diff --git a/include/linux/module_compat.h b/include/linux/module_compat.h deleted file mode 100644 index 02f42a924..000000000 --- a/include/linux/module_compat.h +++ /dev/null @@ -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 <[email protected]>. - * 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 */ |