git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Linux 3.11 compat: fops->iterate()
[zfs.git]
/
module
/
zfs
/
zfs_debug.c
diff --git
a/module/zfs/zfs_debug.c
b/module/zfs/zfs_debug.c
index
f4b5e6f
..
ad611ac
100644
(file)
--- a/
module/zfs/zfs_debug.c
+++ b/
module/zfs/zfs_debug.c
@@
-20,6
+20,7
@@
*/
/*
* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
*/
/*
* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012 by Delphix. All rights reserved.
*/
#include <sys/zfs_context.h>
*/
#include <sys/zfs_context.h>
@@
-59,8
+60,8
@@
zfs_dbgmsg_init(void)
if (zfs_flags == 0) {
#if defined(_KERNEL)
zfs_flags = ZFS_DEBUG_DPRINTF;
if (zfs_flags == 0) {
#if defined(_KERNEL)
zfs_flags = ZFS_DEBUG_DPRINTF;
- spl_debug_
mask |= SD_DPRINTF
;
- spl_debug_s
ubsys |= SS_USER1
;
+ spl_debug_
set_mask(spl_debug_get_mask() | SD_DPRINTF)
;
+ spl_debug_s
et_subsys(spl_debug_get_subsys() | SS_USER1)
;
#else
zfs_flags = ~ZFS_DEBUG_DPRINTF;
#endif /* _KERNEL */
#else
zfs_flags = ~ZFS_DEBUG_DPRINTF;
#endif /* _KERNEL */