OpenZFS 6880 - zdb incorrectly reports feature count mismatch when feature is disabled

Authored by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: George Wilson <george.wilson@delphix.com>
Reviewed by: Prakash Surya <prakash.surya@delphix.com>
Approved by: Robert Mustacchi <rm@joyent.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Ported-by: George Melikov <mail@gmelikov.ru>

OpenZFS-issue: https://www.illumos.org/issues/6880
OpenZFS-commit: https://github.com/openzfs/openzfs/commit/c5d1600
Closes #5641
This commit is contained in:
George Melikov
2017-01-24 19:59:08 +03:00
committed by Brian Behlendorf
parent e82dbae1ee
commit a39ce90660
4 changed files with 56 additions and 3 deletions
+2 -1
View File
@@ -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;
}