New upstream version 0.7.2

[mirror_zfs-debian.git] / include / sys / fm / fs / zfs.h

diff --git a/include/sys/fm/fs/zfs.h b/include/sys/fm/fs/zfs.h
index 0d7eadd4f445903b6af4e2f046406252daa5ff3f..6bef8b4eedddb51a2c086e55dd99a3af05fe8254 100644 (file)
--- a/include/sys/fm/fs/zfs.h
+++ b/include/sys/fm/fs/zfs.h
@@ -36,10 +36,7 @@ extern "C" {
 #define        FM_EREPORT_ZFS_IO                       "io"
 #define        FM_EREPORT_ZFS_DATA                     "data"
 #define        FM_EREPORT_ZFS_DELAY                    "delay"
-#define        FM_EREPORT_ZFS_CONFIG_SYNC              "config.sync"
 #define        FM_EREPORT_ZFS_POOL                     "zpool"
-#define        FM_EREPORT_ZFS_POOL_DESTROY             "zpool.destroy"
-#define        FM_EREPORT_ZFS_POOL_REGUID              "zpool.reguid"
 #define        FM_EREPORT_ZFS_DEVICE_UNKNOWN           "vdev.unknown"
 #define        FM_EREPORT_ZFS_DEVICE_OPEN_FAILED       "vdev.open_failed"
 #define        FM_EREPORT_ZFS_DEVICE_CORRUPT_DATA      "vdev.corrupt_data"
@@ -48,30 +45,25 @@ extern "C" {
 #define        FM_EREPORT_ZFS_DEVICE_TOO_SMALL         "vdev.too_small"
 #define        FM_EREPORT_ZFS_DEVICE_BAD_LABEL         "vdev.bad_label"
 #define        FM_EREPORT_ZFS_DEVICE_BAD_ASHIFT        "vdev.bad_ashift"
-#define        FM_EREPORT_ZFS_DEVICE_REMOVE            "vdev.remove"
-#define        FM_EREPORT_ZFS_DEVICE_CLEAR             "vdev.clear"
-#define        FM_EREPORT_ZFS_DEVICE_CHECK             "vdev.check"
-#define        FM_EREPORT_ZFS_DEVICE_SPARE             "vdev.spare"
-#define        FM_EREPORT_ZFS_DEVICE_AUTOEXPAND        "vdev.autoexpand"
 #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_RESILVER_START           "resilver.start"
-#define        FM_EREPORT_ZFS_RESILVER_FINISH          "resilver.finish"
-#define        FM_EREPORT_ZFS_SCRUB_START              "scrub.start"
-#define        FM_EREPORT_ZFS_SCRUB_FINISH             "scrub.finish"
-#define        FM_EREPORT_ZFS_BOOTFS_VDEV_ATTACH       "bootfs.vdev.attach"
+#define        FM_EREPORT_ZFS_CONFIG_CACHE_WRITE       "config_cache_write"
 
 #define        FM_EREPORT_PAYLOAD_ZFS_POOL             "pool"
 #define        FM_EREPORT_PAYLOAD_ZFS_POOL_FAILMODE    "pool_failmode"
 #define        FM_EREPORT_PAYLOAD_ZFS_POOL_GUID        "pool_guid"
 #define        FM_EREPORT_PAYLOAD_ZFS_POOL_CONTEXT     "pool_context"
+#define        FM_EREPORT_PAYLOAD_ZFS_POOL_STATE       "pool_state"
 #define        FM_EREPORT_PAYLOAD_ZFS_VDEV_GUID        "vdev_guid"
 #define        FM_EREPORT_PAYLOAD_ZFS_VDEV_TYPE        "vdev_type"
 #define        FM_EREPORT_PAYLOAD_ZFS_VDEV_PATH        "vdev_path"
+#define        FM_EREPORT_PAYLOAD_ZFS_VDEV_PHYSPATH    "vdev_physpath"
+#define        FM_EREPORT_PAYLOAD_ZFS_VDEV_ENC_SYSFS_PATH      "vdev_enc_sysfs_path"
 #define        FM_EREPORT_PAYLOAD_ZFS_VDEV_DEVID       "vdev_devid"
 #define        FM_EREPORT_PAYLOAD_ZFS_VDEV_FRU         "vdev_fru"
 #define        FM_EREPORT_PAYLOAD_ZFS_VDEV_STATE       "vdev_state"
+#define        FM_EREPORT_PAYLOAD_ZFS_VDEV_LASTSTATE   "vdev_laststate"
 #define        FM_EREPORT_PAYLOAD_ZFS_VDEV_ASHIFT      "vdev_ashift"
 #define        FM_EREPORT_PAYLOAD_ZFS_VDEV_COMP_TS     "vdev_complete_ts"
 #define        FM_EREPORT_PAYLOAD_ZFS_VDEV_DELTA_TS    "vdev_delta_ts"
@@ -115,9 +107,9 @@ extern "C" {
 #define        FM_EREPORT_FAILMODE_CONTINUE            "continue"
 #define        FM_EREPORT_FAILMODE_PANIC               "panic"
 
-#define        FM_EREPORT_RESOURCE_REMOVED             "removed"
-#define        FM_EREPORT_RESOURCE_AUTOREPLACE         "autoreplace"
-#define        FM_EREPORT_RESOURCE_STATECHANGE         "statechange"
+#define        FM_RESOURCE_REMOVED                     "removed"
+#define        FM_RESOURCE_AUTOREPLACE                 "autoreplace"
+#define        FM_RESOURCE_STATECHANGE                 "statechange"
 
 #ifdef __cplusplus
 }