diff options
| author | Matthew Ahrens <[email protected]> | 2017-01-03 15:18:33 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2018-04-30 10:19:48 -0700 |
| commit | 964c2d69a90c503f44946f31c5d4a8ac4458176d (patch) | |
| tree | ea740d870b10b7e6cb9f8d76d527d3b99a2488ee /include | |
| parent | 089500e79234c9cb741090ade96baec266f0ace4 (diff) | |
OpenZFS 9236 - nuke spa_dbgmsg
We should use zfs_dbgmsg instead of spa_dbgmsg. Or at least,
metaslab_condense() should call zfs_dbgmsg because it's important and
rare enough to always log. It's possible that the message in
zio_dva_allocate() would be too high-frequency for zfs_dbgmsg.
Authored by: Matthew Ahrens <[email protected]>
Reviewed by: Serapheim Dimitropoulos <[email protected]>
Reviewed by: Pavel Zakharov <[email protected]>
Reviewed by: George Wilson <[email protected]>
Reviewed by: Richard Elling <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Approved by: Richard Lowe <[email protected]>
Ported-by: Giuseppe Di Natale <[email protected]>
Patch Notes:
* Removed ZFS_DEBUG_SPA from zfs-module-parameters.5
OpenZFS-issue: https://www.illumos.org/issues/9236
OpenZFS-commit: https://github.com/openzfs/openzfs/commit/cfaba7f668
Closes #7467
Diffstat (limited to 'include')
| -rw-r--r-- | include/sys/spa.h | 7 | ||||
| -rw-r--r-- | include/sys/spa_impl.h | 1 | ||||
| -rw-r--r-- | include/sys/zfs_debug.h | 4 |
3 files changed, 2 insertions, 10 deletions
diff --git a/include/sys/spa.h b/include/sys/spa.h index eb47c21f6..89f4f5107 100644 --- a/include/sys/spa.h +++ b/include/sys/spa.h @@ -1094,13 +1094,6 @@ _NOTE(CONSTCOND) } while (0) #define dprintf_bp(bp, fmt, ...) #endif -extern boolean_t spa_debug_enabled(spa_t *spa); -#define spa_dbgmsg(spa, ...) \ -{ \ - if (spa_debug_enabled(spa)) \ - zfs_dbgmsg(__VA_ARGS__); \ -} - extern int spa_mode_global; /* mode, e.g. FREAD | FWRITE */ extern int zfs_deadman_enabled; extern unsigned long zfs_deadman_synctime_ms; diff --git a/include/sys/spa_impl.h b/include/sys/spa_impl.h index f49138d0f..90d929268 100644 --- a/include/sys/spa_impl.h +++ b/include/sys/spa_impl.h @@ -306,7 +306,6 @@ struct spa { kcondvar_t spa_suspend_cv; /* notification of resume */ zio_suspend_reason_t spa_suspended; /* pool is suspended */ uint8_t spa_claiming; /* pool is doing zil_claim() */ - boolean_t spa_debug; /* debug enabled? */ boolean_t spa_is_root; /* pool is root */ int spa_minref; /* num refs when first opened */ int spa_mode; /* FREAD | FWRITE */ diff --git a/include/sys/zfs_debug.h b/include/sys/zfs_debug.h index 91b161ff8..aa9bfe21f 100644 --- a/include/sys/zfs_debug.h +++ b/include/sys/zfs_debug.h @@ -20,7 +20,7 @@ */ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2012, 2016 by Delphix. All rights reserved. + * Copyright (c) 2012, 2017 by Delphix. All rights reserved. */ #ifndef _SYS_ZFS_DEBUG_H @@ -48,7 +48,7 @@ extern int zfs_dbgmsg_enable; #define ZFS_DEBUG_DNODE_VERIFY (1 << 2) #define ZFS_DEBUG_SNAPNAMES (1 << 3) #define ZFS_DEBUG_MODIFY (1 << 4) -#define ZFS_DEBUG_SPA (1 << 5) +/* 1<<5 was previously used, try not to reuse */ #define ZFS_DEBUG_ZIO_FREE (1 << 6) #define ZFS_DEBUG_HISTOGRAM_VERIFY (1 << 7) #define ZFS_DEBUG_METASLAB_VERIFY (1 << 8) |