svn commit: r351804 - in stable/12: cddl/contrib/opensolaris/cmd/zpool sys/cddl/contrib/opensolaris/common/zfs

[Andriy Gapon]

Author: avg
Date: Wed Sep  4 08:41:55 2019
New Revision: 351804
URL: https://svnweb.freebsd.org/changeset/base/351804

Log:
  MFC r350897: MFV r350896: 6585 sha512, skein, and edonr have an
  unenforced dependency on extensible dataset

Modified:
  stable/12/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7
  stable/12/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7
==============================================================================
--- stable/12/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7	Wed Sep  4 07:33:22 2019	(r351803)
+++ stable/12/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7	Wed Sep  4 08:41:55 2019	(r351804)
@@ -531,7 +531,7 @@ boot loader.
 .Bl -column "READ\-ONLY COMPATIBLE" "org.illumos:sha512"
 .It GUID Ta org.illumos:sha512
 .It READ\-ONLY COMPATIBLE Ta no
-.It DEPENDENCIES Ta none
+.It DEPENDENCIES Ta extensible_dataset
 .El
 .Pp
 The
@@ -570,7 +570,7 @@ are destroyed.
 .Bl -column "READ\-ONLY COMPATIBLE" "org.illumos:skein"
 .It GUID Ta org.illumos:skein
 .It READ\-ONLY COMPATIBLE Ta no
-.It DEPENDENCIES Ta none
+.It DEPENDENCIES Ta extensible_dataset
 .El
 .Pp
 The

Modified: stable/12/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c
==============================================================================
--- stable/12/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c	Wed Sep  4 07:33:22 2019	(r351803)
+++ stable/12/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c	Wed Sep  4 08:41:55 2019	(r351804)
@@ -255,20 +255,33 @@ zpool_feature_init(void)
 	    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);
 
 #ifdef illumos
+	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);
 #endif
 
 	zfeature_register(SPA_FEATURE_DEVICE_REMOVAL,