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 <he.huang@intel.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #3199

diff --git a/man/man5/zfs-module-parameters.5 b/man/man5/zfs-module-parameters.5
index fe31e292a792f254c63907b93f01bf1dfbbb9b57..9a3e2149ae80d282d86185e6381ccd74d1080a00 100644 (file)
--- a/man/man5/zfs-module-parameters.5
+++ b/man/man5/zfs-module-parameters.5
@@ -1413,17 +1413,6 @@ Max zio millisec delay before posting event
 Default value: \fB30,000\fR.
 .RE
 
-.sp
-.ne 2
-.na
-\fBzio_injection_enabled\fR (int)
-.ad
-.RS 12n
-Enable fault injection
-.sp
-Use \fB1\fR for yes and \fB0\fR for no (default).
-.RE
-
 .sp
 .ne 2
 .na

diff --git a/module/zfs/zio.c b/module/zfs/zio.c
index 49e2d93b67837e75b3bdc172c1b9684ef6b0840f..ad0064443d94476d2081cc1f91a54a7d64e5b579 100644 (file)
--- 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 c168f3b47f2e1fdf493ab33b7e6bb42de4486d7a..5afb23c595aeddef4cb1a0f0ed3547dab81eb1d9 100644 (file)
--- 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