Mercurial > illumos > illumos-gate

diff usr/src/uts/common/fs/zfs/zfeature.c @ 13765:9410cf539b11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
backout 3006: causes 3046 (panics after mounting root)
author Richard Lowe <richlowe@richlowe.net>
date Wed, 01 Aug 2012 16:40:39 -0400
parents 38b4aca480b3
children 8f78aae28a63
line wrap: on
line diff
--- a/usr/src/uts/common/fs/zfs/zfeature.c	Tue Jul 31 06:38:31 2012 -0700
+++ b/usr/src/uts/common/fs/zfs/zfeature.c	Wed Aug 01 16:40:39 2012 -0400
@@ -351,7 +351,7 @@
 spa_feature_enable(spa_t *spa, zfeature_info_t *feature, dmu_tx_t *tx)
 {
 	ASSERT3U(spa_version(spa), >=, SPA_VERSION_FEATURES);
-	VERIFY0(feature_do_action(spa->spa_meta_objset,
+	VERIFY3U(0, ==, feature_do_action(spa->spa_meta_objset,
 	    spa->spa_feat_for_read_obj, spa->spa_feat_for_write_obj,
 	    spa->spa_feat_desc_obj, feature, FEATURE_ACTION_ENABLE, tx));
 }
@@ -366,7 +366,7 @@
 spa_feature_incr(spa_t *spa, zfeature_info_t *feature, dmu_tx_t *tx)
 {
 	ASSERT3U(spa_version(spa), >=, SPA_VERSION_FEATURES);
-	VERIFY0(feature_do_action(spa->spa_meta_objset,
+	VERIFY3U(0, ==, feature_do_action(spa->spa_meta_objset,
 	    spa->spa_feat_for_read_obj, spa->spa_feat_for_write_obj,
 	    spa->spa_feat_desc_obj, feature, FEATURE_ACTION_INCR, tx));
 }
@@ -381,7 +381,7 @@
 spa_feature_decr(spa_t *spa, zfeature_info_t *feature, dmu_tx_t *tx)
 {
 	ASSERT3U(spa_version(spa), >=, SPA_VERSION_FEATURES);
-	VERIFY0(feature_do_action(spa->spa_meta_objset,
+	VERIFY3U(0, ==, feature_do_action(spa->spa_meta_objset,
 	    spa->spa_feat_for_read_obj, spa->spa_feat_for_write_obj,
 	    spa->spa_feat_desc_obj, feature, FEATURE_ACTION_DECR, tx));
 }