diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2013-10-16 17:36:59 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2013-10-16 17:36:59 +0000 |
| commit | 588b38ae6fcf32adb479395c5d309c4c10ede8a8 (patch) | |
| tree | 1abbe8f2b64c9092f6c06982f7795b648fa17529 | |
| parent | 81fdfca88936b7bc8b71da407da87f0ff4edf41c (diff) | |
| download | illumos-joyent-588b38ae6fcf32adb479395c5d309c4c10ede8a8.tar.gz | |
OS-2556 make existing zfs filesystem limit feature obsolete
| -rw-r--r-- | usr/src/common/zfs/zfeature_common.c | 6 | ||||
| -rw-r--r-- | usr/src/common/zfs/zfeature_common.h | 2 | ||||
| -rw-r--r-- | usr/src/uts/common/fs/zfs/sys/dsl_dir.h | 6 |
3 files changed, 5 insertions, 9 deletions
diff --git a/usr/src/common/zfs/zfeature_common.c b/usr/src/common/zfs/zfeature_common.c index 057a20f85e..3ca4b9ffbd 100644 --- a/usr/src/common/zfs/zfeature_common.c +++ b/usr/src/common/zfs/zfeature_common.c @@ -153,9 +153,9 @@ zpool_feature_init(void) zfeature_register(SPA_FEATURE_LZ4_COMPRESS, "org.illumos:lz4_compress", "lz4_compress", "LZ4 compression algorithm support.", B_FALSE, B_FALSE, NULL); - zfeature_register(SPA_FEATURE_FS_SS_LIMIT, - "com.joyent:filesystem_limits", "filesystem_limits", - "Filesystem and snapshot limits.", B_TRUE, B_FALSE, NULL); + zfeature_register(SPA_FEATURE_FS_SS_LIMIT_OBS, + "com.joyent:filesystem_limits", "obsolete_fs_limits", + "Obsolete fs and ss limits.", B_TRUE, B_FALSE, NULL); 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); diff --git a/usr/src/common/zfs/zfeature_common.h b/usr/src/common/zfs/zfeature_common.h index 0664458794..9c61b1b0cd 100644 --- a/usr/src/common/zfs/zfeature_common.h +++ b/usr/src/common/zfs/zfeature_common.h @@ -43,7 +43,7 @@ typedef enum spa_feature { SPA_FEATURE_ASYNC_DESTROY, SPA_FEATURE_EMPTY_BPOBJ, SPA_FEATURE_LZ4_COMPRESS, - SPA_FEATURE_FS_SS_LIMIT, + SPA_FEATURE_FS_SS_LIMIT_OBS, SPA_FEATURE_MULTI_VDEV_CRASH_DUMP, SPA_FEATURE_SPACEMAP_HISTOGRAM, SPA_FEATURE_EXTENSIBLE_DATASET, diff --git a/usr/src/uts/common/fs/zfs/sys/dsl_dir.h b/usr/src/uts/common/fs/zfs/sys/dsl_dir.h index 207dc16ddc..27f5e49bbc 100644 --- a/usr/src/uts/common/fs/zfs/sys/dsl_dir.h +++ b/usr/src/uts/common/fs/zfs/sys/dsl_dir.h @@ -72,11 +72,7 @@ typedef struct dsl_dir_phys { uint64_t dd_flags; uint64_t dd_used_breakdown[DD_USED_NUM]; uint64_t dd_clones; /* dsl_dir objects */ - - uint64_t dd_filesystem_count; - uint64_t dd_snapshot_count; - - uint64_t dd_pad[11]; /* pad out to 256 bytes for good measure */ + uint64_t dd_pad[13]; /* pad out to 256 bytes for good measure */ } dsl_dir_phys_t; struct dsl_dir { |