summaryrefslogtreecommitdiffstats
path: root/include/sys/zfs_context.h
diff options
context:
space:
mode:
authorBrian Behlendorf <[email protected]>2012-01-20 15:02:57 -0800
committerBrian Behlendorf <[email protected]>2012-02-02 11:24:30 -0800
commitd7e398ce1a3e6f9c705af43955a684685a798c32 (patch)
tree06ff1d5c4431f8194d5b50c1824532b816902dc0 /include/sys/zfs_context.h
parent0c5dde492ff4fadcc9c43477c81b3d3824ac41db (diff)
Cleanup ZFS debug infrastructure
Historically the internal zfs debug infrastructure has been scattered throughout the code. Since we expect to start making more use of this code this patch performs some cleanup. * Consolidate the zfs debug infrastructure in the zfs_debug.[ch] files. This includes moving the zfs_flags and zfs_recover variables, plus moving the zfs_panic_recover() function. * Remove the existing unused functionality in zfs_debug.c and replace it with code which correctly utilized the spl logging infrastructure. * Remove the __dprintf() function from zfs_ioctl.c. This is dead code, the dprintf() functionality in the kernel relies on the spl log support. * Remove dprintf() from hdr_recl(). This wasn't particularly useful and was missing the required format specifier anyway. * Subsequent patches should unify the dprintf() and zfs_dbgmsg() functions. Signed-off-by: Brian Behlendorf <[email protected]>
Diffstat (limited to 'include/sys/zfs_context.h')
-rw-r--r--include/sys/zfs_context.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/include/sys/zfs_context.h b/include/sys/zfs_context.h
index 4abafcc6f..e4af6fc37 100644
--- a/include/sys/zfs_context.h
+++ b/include/sys/zfs_context.h
@@ -134,10 +134,9 @@ extern int aok;
* ZFS debugging
*/
-#ifdef ZFS_DEBUG
extern void dprintf_setup(int *argc, char **argv);
-#endif /* ZFS_DEBUG */
-
+extern void __dprintf(const char *file, const char *func,
+ int line, const char *fmt, ...);
extern void cmn_err(int, const char *, ...);
extern void vcmn_err(int, const char *, __va_list);
extern void panic(const char *, ...);