diff options
| author | Keith M Wesolowski <wesolows@foobazco.org> | 2014-11-07 16:39:21 +0000 |
|---|---|---|
| committer | Keith M Wesolowski <wesolows@foobazco.org> | 2014-11-07 16:39:21 +0000 |
| commit | e46b615a809a16dc4fe18a3ed07f823fa4a5189f (patch) | |
| tree | ce0e7be16cd624c7ad39c4890d73d433c944ac07 /usr/src/common | |
| parent | f8b9ed83a90e9c166708a03e903b5c036158dbfe (diff) | |
| parent | b515258426fed6c7311fd3f1dea697cfbd4085c6 (diff) | |
| download | illumos-joyent-e46b615a809a16dc4fe18a3ed07f823fa4a5189f.tar.gz | |
[illumos-gate merge]
commit b515258426fed6c7311fd3f1dea697cfbd4085c6
5027 zfs large block support
commit f3477bb2505a35e160b09c9dbf5476112be4fa7d
4457 we apparently change .comment of almost every userland object
commit 738f37bc3dcd61e8a893af0f2d466d76690b70ec
5244 zio pipeline callers should explicitly invoke next stage
commit f7950bf1145637c6dc57742a8bb95631fd5c846f
5243 zdb -b could be much faster
commit cffcfaee1e6b29ef9ceb7d80e4e053ffd029906b
5270 ld(1) cannot handle CIE version 3 in .eh_frame
Conflicts:
usr/src/man/man1m/zfs.1m
Diffstat (limited to 'usr/src/common')
| -rw-r--r-- | usr/src/common/zfs/zfeature_common.c | 12 | ||||
| -rw-r--r-- | usr/src/common/zfs/zfeature_common.h | 1 | ||||
| -rw-r--r-- | usr/src/common/zfs/zfs_prop.c | 4 | ||||
| -rw-r--r-- | usr/src/common/zfs/zpool_prop.c | 2 |
4 files changed, 16 insertions, 3 deletions
diff --git a/usr/src/common/zfs/zfeature_common.c b/usr/src/common/zfs/zfeature_common.c index 9b046ab07d..3358e5eb87 100644 --- a/usr/src/common/zfs/zfeature_common.c +++ b/usr/src/common/zfs/zfeature_common.c @@ -57,7 +57,8 @@ valid_char(char c, boolean_t after_colon) { return ((c >= 'a' && c <= 'z') || (c >= '0' && c <= '9') || - c == (after_colon ? '_' : '.')); + (after_colon && c == '_') || + (!after_colon && (c == '.' || c == '-'))); } /* @@ -221,4 +222,13 @@ zpool_feature_init(void) "com.delphix:embedded_data", "embedded_data", "Blocks which compress very well use even less space.", B_FALSE, B_TRUE, B_TRUE, NULL); + + static const spa_feature_t large_blocks_deps[] = { + SPA_FEATURE_EXTENSIBLE_DATASET, + SPA_FEATURE_NONE + }; + zfeature_register(SPA_FEATURE_LARGE_BLOCKS, + "org.open-zfs:large_blocks", "large_blocks", + "Support for blocks larger than 128KB.", B_FALSE, B_FALSE, B_FALSE, + large_blocks_deps); } diff --git a/usr/src/common/zfs/zfeature_common.h b/usr/src/common/zfs/zfeature_common.h index be2111be91..3f54b392be 100644 --- a/usr/src/common/zfs/zfeature_common.h +++ b/usr/src/common/zfs/zfeature_common.h @@ -51,6 +51,7 @@ typedef enum spa_feature { SPA_FEATURE_EMBEDDED_DATA, SPA_FEATURE_BOOKMARKS, SPA_FEATURE_FS_SS_LIMIT, + SPA_FEATURE_LARGE_BLOCKS, SPA_FEATURES } spa_feature_t; diff --git a/usr/src/common/zfs/zfs_prop.c b/usr/src/common/zfs/zfs_prop.c index e718baa32c..54aaa027dd 100644 --- a/usr/src/common/zfs/zfs_prop.c +++ b/usr/src/common/zfs/zfs_prop.c @@ -397,8 +397,8 @@ zfs_prop_init(void) /* inherit number properties */ zprop_register_number(ZFS_PROP_RECORDSIZE, "recordsize", - SPA_MAXBLOCKSIZE, PROP_INHERIT, - ZFS_TYPE_FILESYSTEM, "512 to 128k, power of 2", "RECSIZE"); + SPA_OLD_MAXBLOCKSIZE, PROP_INHERIT, + ZFS_TYPE_FILESYSTEM, "512 to 1M, power of 2", "RECSIZE"); /* hidden properties */ zprop_register_hidden(ZFS_PROP_CREATETXG, "createtxg", PROP_TYPE_NUMBER, diff --git a/usr/src/common/zfs/zpool_prop.c b/usr/src/common/zfs/zpool_prop.c index a400f821e2..4d906b02bc 100644 --- a/usr/src/common/zfs/zpool_prop.c +++ b/usr/src/common/zfs/zpool_prop.c @@ -127,6 +127,8 @@ zpool_prop_init(void) /* hidden properties */ zprop_register_hidden(ZPOOL_PROP_NAME, "name", PROP_TYPE_STRING, PROP_READONLY, ZFS_TYPE_POOL, "NAME"); + zprop_register_hidden(ZPOOL_PROP_MAXBLOCKSIZE, "maxblocksize", + PROP_TYPE_NUMBER, PROP_READONLY, ZFS_TYPE_POOL, "MAXBLOCKSIZE"); } /* |