diff options
author | George Melikov <[email protected]> | 2017-01-24 19:59:08 +0300 |
---|---|---|
committer | Brian Behlendorf <[email protected]> | 2017-01-24 08:59:08 -0800 |
commit | a39ce906602ce721774f4e17671c05bd5c710d1e (patch) | |
tree | 3b05a045923234be957126d08b52cd05af458d47 /cmd | |
parent | e82dbae1ee33170ed3924c5229db651caf384333 (diff) |
OpenZFS 6880 - zdb incorrectly reports feature count mismatch when feature is disabled
Authored by: Matthew Ahrens <[email protected]>
Reviewed by: George Wilson <[email protected]>
Reviewed by: Prakash Surya <[email protected]>
Approved by: Robert Mustacchi <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Ported-by: George Melikov <[email protected]>
OpenZFS-issue: https://www.illumos.org/issues/6880
OpenZFS-commit: https://github.com/openzfs/openzfs/commit/c5d1600
Closes #5641
Diffstat (limited to 'cmd')
-rw-r--r-- | cmd/zdb/zdb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmd/zdb/zdb.c b/cmd/zdb/zdb.c index f7d3dbb8b..938df8227 100644 --- a/cmd/zdb/zdb.c +++ b/cmd/zdb/zdb.c @@ -3162,7 +3162,8 @@ dump_zpool(spa_t *spa) uint64_t refcount; if (!(spa_feature_table[f].fi_flags & - ZFEATURE_FLAG_PER_DATASET)) { + ZFEATURE_FLAG_PER_DATASET) || + !spa_feature_is_enabled(spa, f)) { ASSERT0(dataset_feature_count[f]); continue; } |