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>
illumos · Jul 19, 2012 · 5722177 · 5722177
1 parent 21b2731
commit 5722177
Show file tree

Hide file tree

Showing 11 changed files with 392 additions and 119 deletions.
diff --git a/usr/src/cmd/zhack/zhack.c b/usr/src/cmd/zhack/zhack.c
@@ -280,7 +280,7 @@ feature_enable_sync(void *arg1, void *arg2, dmu_tx_t *tx)
 
 	spa_feature_enable(spa, feature, tx);
 	spa_history_log_internal(spa, "zhack enable feature", tx,
-	    "name=%s can_readonly=%u",
+	    "guid=%s can_readonly=%u",
 	    feature->fi_guid, feature->fi_can_readonly);
 }
 
@@ -360,7 +360,7 @@ feature_incr_sync(void *arg1, void *arg2, dmu_tx_t *tx)
 
 	spa_feature_incr(spa, feature, tx);
 	spa_history_log_internal(spa, "zhack feature incr", tx,
-	    "name=%s", feature->fi_guid);
+	    "guid=%s", feature->fi_guid);
 }
 
 static void
@@ -371,7 +371,7 @@ feature_decr_sync(void *arg1, void *arg2, dmu_tx_t *tx)
 
 	spa_feature_decr(spa, feature, tx);
 	spa_history_log_internal(spa, "zhack feature decr", tx,
-	    "name=%s", feature->fi_guid);
+	    "guid=%s", feature->fi_guid);
 }
 
 static void