summaryrefslogtreecommitdiff
path: root/usr/src/common/zfs/zfeature_common.c
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/common/zfs/zfeature_common.c')
-rw-r--r--usr/src/common/zfs/zfeature_common.c22
1 files changed, 22 insertions, 0 deletions
diff --git a/usr/src/common/zfs/zfeature_common.c b/usr/src/common/zfs/zfeature_common.c
index feab5145c0..0eb681b723 100644
--- a/usr/src/common/zfs/zfeature_common.c
+++ b/usr/src/common/zfs/zfeature_common.c
@@ -262,6 +262,18 @@ zpool_feature_init(void)
ZFEATURE_FLAG_PER_DATASET, large_blocks_deps);
{
+ static const spa_feature_t bookmark_v2_deps[] = {
+ SPA_FEATURE_EXTENSIBLE_DATASET,
+ SPA_FEATURE_BOOKMARKS,
+ SPA_FEATURE_NONE
+ };
+ zfeature_register(SPA_FEATURE_BOOKMARK_V2,
+ "com.datto:bookmark_v2", "bookmark_v2",
+ "Support for larger bookmarks",
+ ZFEATURE_FLAG_PER_DATASET, bookmark_v2_deps);
+ }
+
+ {
static const spa_feature_t large_dnode_deps[] = {
SPA_FEATURE_EXTENSIBLE_DATASET,
SPA_FEATURE_NONE
@@ -324,4 +336,14 @@ zpool_feature_init(void)
"com.datto:resilver_defer", "resilver_defer",
"Support for defering new resilvers when one is already running.",
ZFEATURE_FLAG_READONLY_COMPAT, NULL);
+
+ static const spa_feature_t encryption_deps[] = {
+ SPA_FEATURE_EXTENSIBLE_DATASET,
+ SPA_FEATURE_BOOKMARK_V2,
+ SPA_FEATURE_NONE
+ };
+ zfeature_register(SPA_FEATURE_ENCRYPTION,
+ "com.datto:encryption", "encryption",
+ "Support for dataset level encryption",
+ ZFEATURE_FLAG_PER_DATASET, encryption_deps);
}