From 99d3042bc82342754be149a2ce0f605982df9c2a Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Tue, 20 Jul 2010 13:39:28 -0700 Subject: [PATCH] Update to use reworked SPL debugging This change updates the ZFS code to use the slightly reworked SPL debug infrastructure. It also explicitly sets all ZFS dprintf debugging to use the SS_USER1 subsystem for logging in the SPL debug log. --- module/zfs/include/sys/zfs_debug.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/module/zfs/include/sys/zfs_debug.h b/module/zfs/include/sys/zfs_debug.h index 3f3d8125e8..f08d7cd2bc 100644 --- a/module/zfs/include/sys/zfs_debug.h +++ b/module/zfs/include/sys/zfs_debug.h @@ -55,8 +55,16 @@ extern int zfs_flags; #ifdef ZFS_DEBUG #if defined(_KERNEL) && defined(HAVE_SPL) -#include -#define dprintf(...) CDEBUG_LIMIT(D_DPRINTF, __VA_ARGS__) +/* + * Log ZFS debug messages as the spl SS_USER1 subsystem. + */ +#include + +#ifdef SS_DEBUG_SUBSYS +#undef SS_DEBUG_SUBSYS +#endif +#define SS_DEBUG_SUBSYS SS_USER1 +#define dprintf(...) SDEBUG_LIMIT(SD_DPRINTF, __VA_ARGS__) #else extern void __dprintf(const char *file, const char *func, int line, const char *fmt, ...);