zfs: allow both DEBUG and ZFS_DEBUG to be defined on command line

Discussed with: pjd MFC after: 10 days
2012-09-18 08:00:56 +00:00 · 2012-09-18 08:00:56 +00:00 · 63f3204e0b
commit 63f3204e0b
parent 2e8dd1a520
1 changed files with 2 additions and 0 deletions
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h
@ -43,8 +43,10 @@ extern "C" {
 */

 #if defined(DEBUG) || !defined(_KERNEL)
+#if !defined(ZFS_DEBUG)
 #define	ZFS_DEBUG
 #endif
+#endif

 extern int zfs_flags;