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

zio_injection_enabled should not be a module option

Browse Source 
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
This commit is contained in:
Isaac Huang 2015-03-21 23:32:54 -06:00 committed by Brian Behlendorf
parent d07b7c7f21
commit e89bd69775
3 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
man/man5/zfs-module-parameters.5
View File

@ -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

8
module/zfs/zio.c
View File

@ -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);

9
module/zfs/zio_inject.c
View File

@ -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