diff options
| author | avg <avg@FreeBSD.org> | 2014-02-17 17:11:38 +0000 |
|---|---|---|
| committer | avg <avg@FreeBSD.org> | 2014-02-17 17:11:38 +0000 |
| commit | 51714698c30564bf94b9e62fd46b2a1d5616c7e5 (patch) | |
| tree | a610550b00fbf853249cb8cdfdc2400785ca1069 /sys/cddl/contrib/opensolaris/common | |
| parent | 92000681d74b0aa6a7484fbba39edf34a2ec6a96 (diff) | |
| download | FreeBSD-src-51714698c30564bf94b9e62fd46b2a1d5616c7e5.zip FreeBSD-src-51714698c30564bf94b9e62fd46b2a1d5616c7e5.tar.gz | |
MFC r258717: MFV r258371,r258372: 4101 metaslab_debug should allow for
fine-grained control
Diffstat (limited to 'sys/cddl/contrib/opensolaris/common')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c | 5 | ||||
| -rw-r--r-- | sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c b/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c index b691989..2c52b6c 100644 --- a/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c +++ b/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c @@ -20,7 +20,7 @@ */ /* - * Copyright (c) 2012 by Delphix. All rights reserved. + * Copyright (c) 2013 by Delphix. All rights reserved. * Copyright (c) 2013 by Saso Kiselkov. All rights reserved. * Copyright (c) 2013, Joyent, Inc. All rights reserved. */ @@ -163,4 +163,7 @@ zpool_feature_init(void) zfeature_register(SPA_FEATURE_MULTI_VDEV_CRASH_DUMP, "com.joyent:multi_vdev_crash_dump", "multi_vdev_crash_dump", "Crash dumps to multiple vdev pools.", B_FALSE, B_FALSE, NULL); + zfeature_register(SPA_FEATURE_SPACEMAP_HISTOGRAM, + "com.delphix:spacemap_histogram", "spacemap_histogram", + "Spacemaps maintain space histograms.", B_TRUE, B_FALSE, NULL); } diff --git a/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h b/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h index a0b73c2..1ce368b 100644 --- a/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h +++ b/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h @@ -20,7 +20,7 @@ */ /* - * Copyright (c) 2012 by Delphix. All rights reserved. + * Copyright (c) 2013 by Delphix. All rights reserved. * Copyright (c) 2013 by Saso Kiselkov. All rights reserved. * Copyright (c) 2013, Joyent, Inc. All rights reserved. */ @@ -55,6 +55,7 @@ static enum spa_feature { SPA_FEATURE_EMPTY_BPOBJ, SPA_FEATURE_LZ4_COMPRESS, SPA_FEATURE_MULTI_VDEV_CRASH_DUMP, + SPA_FEATURE_SPACEMAP_HISTOGRAM, SPA_FEATURES } spa_feature_t; |
