Illumos #3145, #3212

[zfs.git] / include / sys / fs / zfs.h

diff --git a/include/sys/fs/zfs.h b/include/sys/fs/zfs.h
index 61596f7..137dd39 100644 (file)
--- a/include/sys/fs/zfs.h
+++ b/include/sys/fs/zfs.h
@@ -524,6 +524,7 @@ typedef struct zpool_rewind_policy {
 #define        ZPOOL_CONFIG_LOAD_INFO          "load_info"     /* not stored on disk */
 #define        ZPOOL_CONFIG_REWIND_INFO        "rewind_info"   /* not stored on disk */
 #define        ZPOOL_CONFIG_UNSUP_FEAT         "unsup_feat"    /* not stored on disk */
+#define        ZPOOL_CONFIG_ENABLED_FEAT       "enabled_feat"  /* not stored on disk */
 #define        ZPOOL_CONFIG_CAN_RDONLY         "can_rdonly"    /* not stored on disk */
 #define        ZPOOL_CONFIG_FEATURES_FOR_READ  "features_for_read"
 #define        ZPOOL_CONFIG_FEATURE_STATS      "feature_stats" /* not stored on disk */
@@ -954,6 +955,7 @@ typedef enum history_internal_events {
        LOG_DS_USER_HOLD,
        LOG_DS_USER_RELEASE,
        LOG_POOL_SPLIT,
+       LOG_POOL_GUID_CHANGE,
        LOG_END
 } history_internal_events_t;