diff options
| author | Will Andrews <[email protected]> | 2015-12-31 17:38:59 +0100 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2016-01-12 14:42:32 -0800 |
| commit | e6cfd633be909956c8a6998f478ceb32558c210c (patch) | |
| tree | 7a44c5e1873c0aba4bc19e2be76738de55629132 /include/sys | |
| parent | 7ea4f88f8f94f6071f8533e85555139c81ddd647 (diff) | |
Illumos 3749 - zfs event processing should work on R/O root filesystems
3749 zfs event processing should work on R/O root filesystems
Reviewed by: Matthew Ahrens <[email protected]>
Reviewed by: Eric Schrock <[email protected]>
Approved by: Christopher Siden <[email protected]>
References:
https://www.illumos.org/issues/3749
https://github.com/illumos/illumos-gate/commit/3cb69f7
Porting notes:
- [include/sys/spa_impl.h]
- ffe9d38 Add generic errata infrastructure
- 1421c89 Add visibility in to arc_read
- [include/sys/fm/fs/zfs.h]
- 2668527 Add linux events
- 6283f55 Support custom build directories and move includes
- [module/zfs/spa_config.c]
- Updated spa_config_sync() to match illumos with the exception
of a Linux specific block.
Ported-by: kernelOfTruth [email protected]
Signed-off-by: Brian Behlendorf <[email protected]>
Diffstat (limited to 'include/sys')
| -rw-r--r-- | include/sys/fm/fs/zfs.h | 1 | ||||
| -rw-r--r-- | include/sys/spa_impl.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/sys/fm/fs/zfs.h b/include/sys/fm/fs/zfs.h index 0d7eadd4f..26f400303 100644 --- a/include/sys/fm/fs/zfs.h +++ b/include/sys/fm/fs/zfs.h @@ -56,6 +56,7 @@ extern "C" { #define FM_EREPORT_ZFS_IO_FAILURE "io_failure" #define FM_EREPORT_ZFS_PROBE_FAILURE "probe_failure" #define FM_EREPORT_ZFS_LOG_REPLAY "log_replay" +#define FM_EREPORT_ZFS_CONFIG_CACHE_WRITE "config_cache_write" #define FM_EREPORT_ZFS_RESILVER_START "resilver.start" #define FM_EREPORT_ZFS_RESILVER_FINISH "resilver.finish" #define FM_EREPORT_ZFS_SCRUB_START "scrub.start" diff --git a/include/sys/spa_impl.h b/include/sys/spa_impl.h index 0b49c7147..0bb6dccdc 100644 --- a/include/sys/spa_impl.h +++ b/include/sys/spa_impl.h @@ -252,6 +252,7 @@ struct spa { uint64_t spa_deadman_synctime; /* deadman expiration timer */ uint64_t spa_errata; /* errata issues detected */ spa_stats_t spa_stats; /* assorted spa statistics */ + hrtime_t spa_ccw_fail_time; /* Conf cache write fail time */ /* * spa_refcount & spa_config_lock must be the last elements |