summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--man/man5/zpool-features.56
-rw-r--r--module/zfs/zfeature_common.c26
2 files changed, 26 insertions, 6 deletions
diff --git a/man/man5/zpool-features.5 b/man/man5/zpool-features.5
index dcfb30d18..ffefd4129 100644
--- a/man/man5/zpool-features.5
+++ b/man/man5/zpool-features.5
@@ -464,7 +464,7 @@ improving performance by avoiding the use of spill blocks.
l l .
GUID org.illumos:sha512
READ\-ONLY COMPATIBLE no
-DEPENDENCIES none
+DEPENDENCIES extensible_dataset
.TE
This feature enables the use of the SHA-512/256 truncated hash algorithm
@@ -497,7 +497,7 @@ the updated GRUB stage2 module is installed).
l l .
GUID org.illumos:skein
READ\-ONLY COMPATIBLE no
-DEPENDENCIES none
+DEPENDENCIES extensible_dataset
.TE
This feature enables the use of the Skein hash algorithm for checksum
@@ -533,7 +533,7 @@ error.
l l .
GUID org.illumos:edonr
READ\-ONLY COMPATIBLE no
-DEPENDENCIES none
+DEPENDENCIES extensible_dataset
.TE
This feature enables the use of the Edon-R hash algorithm for checksum,
diff --git a/module/zfs/zfeature_common.c b/module/zfs/zfeature_common.c
index e8b0a16ae..9beb4903e 100644
--- a/module/zfs/zfeature_common.c
+++ b/module/zfs/zfeature_common.c
@@ -253,16 +253,36 @@ zpool_feature_init(void)
"Variable on-disk size of dnodes.",
ZFEATURE_FLAG_PER_DATASET, large_dnode_deps);
}
+
+ {
+ static const spa_feature_t sha512_deps[] = {
+ SPA_FEATURE_EXTENSIBLE_DATASET,
+ SPA_FEATURE_NONE
+ };
zfeature_register(SPA_FEATURE_SHA512,
"org.illumos:sha512", "sha512",
"SHA-512/256 hash algorithm.",
- ZFEATURE_FLAG_PER_DATASET, NULL);
+ ZFEATURE_FLAG_PER_DATASET, sha512_deps);
+ }
+ {
+ static const spa_feature_t skein_deps[] = {
+ SPA_FEATURE_EXTENSIBLE_DATASET,
+ SPA_FEATURE_NONE
+ };
zfeature_register(SPA_FEATURE_SKEIN,
"org.illumos:skein", "skein",
"Skein hash algorithm.",
- ZFEATURE_FLAG_PER_DATASET, NULL);
+ ZFEATURE_FLAG_PER_DATASET, skein_deps);
+ }
+
+ {
+ static const spa_feature_t edonr_deps[] = {
+ SPA_FEATURE_EXTENSIBLE_DATASET,
+ SPA_FEATURE_NONE
+ };
zfeature_register(SPA_FEATURE_EDONR,
"org.illumos:edonr", "edonr",
"Edon-R hash algorithm.",
- ZFEATURE_FLAG_PER_DATASET, NULL);
+ ZFEATURE_FLAG_PER_DATASET, edonr_deps);
+ }
}