diff options
| author | Isaac Huang <[email protected]> | 2015-03-21 23:32:54 -0600 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2015-03-24 13:22:03 -0700 |
| commit | e89bd69775d5379f6835dade1e14005aa17f4903 (patch) | |
| tree | a4549a022f800838c126999ed5fe130cca3c17ca /module/zfs | |
| parent | d07b7c7f210e3f92775ad93a7306812edf524bfc (diff) | |
zio_injection_enabled should not be a module option
The zio_inject.c keeps zio_injection_enabled as a counter of
fault handlers, so it should not be exported to user space as
a module option.
Several EXPORT_SYMBOLs are moved from zio.c to zio_inject.c,
where the symbols are defined.
Signed-off-by: Isaac Huang <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #3199
Diffstat (limited to 'module/zfs')
| -rw-r--r-- | module/zfs/zio.c | 8 | ||||
| -rw-r--r-- | module/zfs/zio_inject.c | 9 |
2 files changed, 7 insertions, 10 deletions
diff --git a/module/zfs/zio.c b/module/zfs/zio.c index 49e2d93b6..ad0064443 100644 --- a/module/zfs/zio.c +++ b/module/zfs/zio.c @@ -3331,14 +3331,6 @@ zbookmark_is_before(const dnode_phys_t *dnp, const zbookmark_phys_t *zb1, } #if defined(_KERNEL) && defined(HAVE_SPL) -/* Fault injection */ -EXPORT_SYMBOL(zio_injection_enabled); -EXPORT_SYMBOL(zio_inject_fault); -EXPORT_SYMBOL(zio_inject_list_next); -EXPORT_SYMBOL(zio_clear_fault); -EXPORT_SYMBOL(zio_handle_fault_injection); -EXPORT_SYMBOL(zio_handle_device_injection); -EXPORT_SYMBOL(zio_handle_label_injection); EXPORT_SYMBOL(zio_type_name); EXPORT_SYMBOL(zio_buf_alloc); EXPORT_SYMBOL(zio_data_buf_alloc); diff --git a/module/zfs/zio_inject.c b/module/zfs/zio_inject.c index c168f3b47..5afb23c59 100644 --- a/module/zfs/zio_inject.c +++ b/module/zfs/zio_inject.c @@ -525,6 +525,11 @@ zio_inject_fini(void) } #if defined(_KERNEL) && defined(HAVE_SPL) -module_param(zio_injection_enabled, int, 0644); -MODULE_PARM_DESC(zio_injection_enabled, "Enable fault injection"); +EXPORT_SYMBOL(zio_injection_enabled); +EXPORT_SYMBOL(zio_inject_fault); +EXPORT_SYMBOL(zio_inject_list_next); +EXPORT_SYMBOL(zio_clear_fault); +EXPORT_SYMBOL(zio_handle_fault_injection); +EXPORT_SYMBOL(zio_handle_device_injection); +EXPORT_SYMBOL(zio_handle_label_injection); #endif |