Illumos 4171, 4172

[mirror_zfs.git] / module / zfs / dsl_pool.c

diff --git a/module/zfs/dsl_pool.c b/module/zfs/dsl_pool.c
index eed4bd49742821cc790228826d3617a8c7f5ab6f..91476cc0b6b741834b603ee241f3bb9ea3326ffb 100644 (file)
--- a/module/zfs/dsl_pool.c
+++ b/module/zfs/dsl_pool.c
@@ -245,8 +245,7 @@ dsl_pool_open(dsl_pool_t *dp)
                    dp->dp_meta_objset, obj));
        }
 
-       if (spa_feature_is_active(dp->dp_spa,
-           &spa_feature_table[SPA_FEATURE_ASYNC_DESTROY])) {
+       if (spa_feature_is_active(dp->dp_spa, SPA_FEATURE_ASYNC_DESTROY)) {
                err = zap_lookup(dp->dp_meta_objset, DMU_POOL_DIRECTORY_OBJECT,
                    DMU_POOL_BPTREE_OBJ, sizeof (uint64_t), 1,
                    &dp->dp_bptree_obj);
@@ -254,8 +253,7 @@ dsl_pool_open(dsl_pool_t *dp)
                        goto out;
        }
 
-       if (spa_feature_is_active(dp->dp_spa,
-           &spa_feature_table[SPA_FEATURE_EMPTY_BPOBJ])) {
+       if (spa_feature_is_active(dp->dp_spa, SPA_FEATURE_EMPTY_BPOBJ)) {
                err = zap_lookup(dp->dp_meta_objset, DMU_POOL_DIRECTORY_OBJECT,
                    DMU_POOL_EMPTY_BPOBJ, sizeof (uint64_t), 1,
                    &dp->dp_empty_bpobj);
@@ -1049,15 +1047,14 @@ dsl_pool_config_held(dsl_pool_t *dp)
 EXPORT_SYMBOL(dsl_pool_config_enter);
 EXPORT_SYMBOL(dsl_pool_config_exit);
 
-/* zfs_dirty_data_max_percent only applied at module load time in arc_init(). */
+/* zfs_dirty_data_max_percent only applied at module load in arc_init(). */
 module_param(zfs_dirty_data_max_percent, int, 0444);
 MODULE_PARM_DESC(zfs_dirty_data_max_percent, "percent of ram can be dirty");
 
-/* zfs_dirty_data_max_max_percent only applied at module load time in
- * arc_init(). */
+/* zfs_dirty_data_max_max_percent only applied at module load in arc_init(). */
 module_param(zfs_dirty_data_max_max_percent, int, 0444);
 MODULE_PARM_DESC(zfs_dirty_data_max_max_percent,
-    "zfs_dirty_data_max upper bound as % of RAM");
+       "zfs_dirty_data_max upper bound as % of RAM");
 
 module_param(zfs_delay_min_dirty_percent, int, 0644);
 MODULE_PARM_DESC(zfs_delay_min_dirty_percent, "transaction delay threshold");
@@ -1065,10 +1062,10 @@ MODULE_PARM_DESC(zfs_delay_min_dirty_percent, "transaction delay threshold");
 module_param(zfs_dirty_data_max, ulong, 0644);
 MODULE_PARM_DESC(zfs_dirty_data_max, "determines the dirty space limit");
 
-/* zfs_dirty_data_max_max only applied at module load time in arc_init(). */
+/* zfs_dirty_data_max_max only applied at module load in arc_init(). */
 module_param(zfs_dirty_data_max_max, ulong, 0444);
 MODULE_PARM_DESC(zfs_dirty_data_max_max,
-    "zfs_dirty_data_max upper bound in bytes");
+       "zfs_dirty_data_max upper bound in bytes");
 
 module_param(zfs_dirty_data_sync, ulong, 0644);
 MODULE_PARM_DESC(zfs_dirty_data_sync, "sync txg when this much dirty data");