From a39ce906602ce721774f4e17671c05bd5c710d1e Mon Sep 17 00:00:00 2001
From: George Melikov <mail@gmelikov.ru>
Date: Tue, 24 Jan 2017 19:59:08 +0300
Subject: 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
---
 cmd/zdb/zdb.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'cmd')

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;
 			}
-- 
cgit v1.2.3