diff options
| author | Brian Behlendorf <[email protected]> | 2016-01-11 13:46:29 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2016-01-11 14:10:30 -0800 |
| commit | b870c7e5f4fe4520a32277bcc57b10a200a390aa (patch) | |
| tree | ce8218d79bbe9fb5fb2ec809029becefb3a464fa /include | |
| parent | 928c58dd0f297024363f8703cc57670fa9c96db7 (diff) | |
Revert "Illumos 3749 - zfs event processing should work on R/O root filesystems"
This reverts commit b47637ecdc7b647ec5bd9dfca888179eecfaa72d which
introduced a regression in ztest.
$ ./cmd/ztest/ztest -V
5 vdevs, 7 datasets, 23 threads, 300 seconds...
*** Error in `/rpool/home/behlendo/src/git/zfs/cmd/ztest/.libs/lt-ztest':
double free or corruption (fasttop): 0x0000000000d339f0 ***
Diffstat (limited to 'include')
| -rw-r--r-- | include/sys/fm/fs/zfs.h | 1 | ||||
| -rw-r--r-- | include/sys/spa_impl.h | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/include/sys/fm/fs/zfs.h b/include/sys/fm/fs/zfs.h index 26f400303..0d7eadd4f 100644 --- a/include/sys/fm/fs/zfs.h +++ b/include/sys/fm/fs/zfs.h @@ -56,7 +56,6 @@ 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 0bb6dccdc..0b49c7147 100644 --- a/include/sys/spa_impl.h +++ b/include/sys/spa_impl.h @@ -252,7 +252,6 @@ 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 |