diff options
| author | delphij <delphij@FreeBSD.org> | 2014-03-19 23:36:12 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2014-03-19 23:36:12 +0000 |
| commit | 5b9b9ced5021655cfea1938e478c1a00a7301d5d (patch) | |
| tree | fd61225d2df2d7a6be396c0d8f12265aed4a6e87 /sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c | |
| parent | b7ccc923c2cefa127943f10a6c5634b75c980a79 (diff) | |
| download | FreeBSD-src-5b9b9ced5021655cfea1938e478c1a00a7301d5d.zip FreeBSD-src-5b9b9ced5021655cfea1938e478c1a00a7301d5d.tar.gz | |
MFC r259813 + r259813: MFV r258374:
4171 clean up spa_feature_*() interfaces
4172 implement extensible_dataset feature for use by other zpool
features
illumos/illumos-gate@2acef22db7808606888f8f92715629ff3ba555b9
Diffstat (limited to 'sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c index 753927d..2154fdf 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c @@ -1861,8 +1861,7 @@ zfs_mvdev_dump_feature_check(void *arg, dmu_tx_t *tx) { spa_t *spa = dmu_tx_pool(tx)->dp_spa; - if (spa_feature_is_active(spa, - &spa_feature_table[SPA_FEATURE_MULTI_VDEV_CRASH_DUMP])) + if (spa_feature_is_active(spa, SPA_FEATURE_MULTI_VDEV_CRASH_DUMP)) return (1); return (0); } @@ -1873,8 +1872,7 @@ zfs_mvdev_dump_activate_feature_sync(void *arg, dmu_tx_t *tx) { spa_t *spa = dmu_tx_pool(tx)->dp_spa; - spa_feature_incr(spa, - &spa_feature_table[SPA_FEATURE_MULTI_VDEV_CRASH_DUMP], tx); + spa_feature_incr(spa, SPA_FEATURE_MULTI_VDEV_CRASH_DUMP, tx); } static int @@ -1909,7 +1907,7 @@ zvol_dump_init(zvol_state_t *zv, boolean_t resize) */ if (vd->vdev_children > 1 || vd->vdev_ops == &vdev_raidz_ops) { if (!spa_feature_is_enabled(spa, - &spa_feature_table[SPA_FEATURE_MULTI_VDEV_CRASH_DUMP])) + SPA_FEATURE_MULTI_VDEV_CRASH_DUMP)) return (SET_ERROR(ENOTSUP)); (void) dsl_sync_task(spa_name(spa), zfs_mvdev_dump_feature_check, @@ -1930,8 +1928,8 @@ zvol_dump_init(zvol_state_t *zv, boolean_t resize) * function. Otherwise, use the old default -- OFF. */ checksum = spa_feature_is_active(spa, - &spa_feature_table[SPA_FEATURE_MULTI_VDEV_CRASH_DUMP]) ? - ZIO_CHECKSUM_NOPARITY : ZIO_CHECKSUM_OFF; + SPA_FEATURE_MULTI_VDEV_CRASH_DUMP) ? ZIO_CHECKSUM_NOPARITY : + ZIO_CHECKSUM_OFF; /* * If we are resizing the dump device then we only need to |
