diff options
author | Christopher Siden <chris.siden@delphix.com> | 2012-12-14 15:00:45 -0800 |
---|---|---|
committer | Brian Behlendorf <behlendorf1@llnl.gov> | 2013-01-08 10:35:43 -0800 |
commit | b9b24bb4ca45f2d903efadba44d10dfd182f62ac (patch) | |
tree | 66851e088971be7fbeed9f938227caf5295216b8 /include | |
parent | 3bc7e0fb0f3904eaf41e0b9768ebe2d042ae98aa (diff) |
Illumos #2762: zpool command should have better support for feature flags
2762 zpool command should have better support for feature flags
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: George Wilson <george.wilson@delphix.com>
Approved by: Eric Schrock <Eric.Schrock@delphix.com>
References:
illumos/illumos-gate@57221772c3fc05faba04bf48ddff45abf2bbf2bd
https://www.illumos.org/issues/2762
Ported-by: Brian Behlendorf <behlendorf1@llnl.gov>
Diffstat (limited to 'include')
-rw-r--r-- | include/libzfs.h | 3 | ||||
-rw-r--r-- | include/sys/fs/zfs.h | 1 | ||||
-rw-r--r-- | include/sys/zfeature.h | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/include/libzfs.h b/include/libzfs.h index 83ac34394..08f3d9ebd 100644 --- a/include/libzfs.h +++ b/include/libzfs.h @@ -322,7 +322,8 @@ typedef enum { * requiring administrative attention. There is no corresponding * message ID. */ - ZPOOL_STATUS_VERSION_OLDER, /* older on-disk version */ + ZPOOL_STATUS_VERSION_OLDER, /* older legacy on-disk version */ + ZPOOL_STATUS_FEAT_DISABLED, /* supported features are disabled */ ZPOOL_STATUS_RESILVERING, /* device being resilvered */ ZPOOL_STATUS_OFFLINE_DEV, /* device online */ ZPOOL_STATUS_REMOVED_DEV, /* removed device */ diff --git a/include/sys/fs/zfs.h b/include/sys/fs/zfs.h index 800eb7768..137dd39e6 100644 --- 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 */ diff --git a/include/sys/zfeature.h b/include/sys/zfeature.h index 9ff1c93df..481e85b1b 100644 --- a/include/sys/zfeature.h +++ b/include/sys/zfeature.h @@ -35,7 +35,7 @@ extern "C" { #endif extern boolean_t feature_is_supported(objset_t *os, uint64_t obj, - uint64_t desc_obj, nvlist_t *unsup_feat); + uint64_t desc_obj, nvlist_t *unsup_feat, nvlist_t *enabled_feat); struct spa; extern void spa_feature_create_zap_objects(struct spa *, dmu_tx_t *); |