svn commit: r329482 - stable/11/sys/cddl/contrib/opensolaris/common/zfs

[Alexander Motin]

Author: mav
Date: Sat Feb 17 23:54:59 2018
New Revision: 329482
URL: https://svnweb.freebsd.org/changeset/base/329482

Log:
  MFC r323002 (by emaste): zfs: do not advertise edonr which is not yet supported
  
  illumos 4185 ("add new cryptographic checksums to ZFS: SHA-512,
  Skein, Edon-R") was intentionally merged only partially in r289422,
  without adding support for skein, sha512 and edonr on FreeBSD.
  
  Support for skein and sha512 was added later on, but edonr is still not
  implemented in FreeBSD.
  
  Prior to this commit zfs(8) correctly rejected edonr, but with an error
  message that claimed support:
  
  fk at r500 ~ $zfs set checksum=edonr tank
  cannot set property for 'tank': 'checksum' must be one of 'on | off | fletcher2 | fletcher4 | sha256 | sha512 | skein | edonr'

Modified:
  stable/11/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c
==============================================================================
--- stable/11/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c	Sat Feb 17 23:51:15 2018	(r329481)
+++ stable/11/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c	Sat Feb 17 23:54:59 2018	(r329482)
@@ -242,11 +242,11 @@ zfs_prop_init(void)
 	    ZIO_CHECKSUM_DEFAULT, PROP_INHERIT, ZFS_TYPE_FILESYSTEM |
 	    ZFS_TYPE_VOLUME,
 	    "on | off | fletcher2 | fletcher4 | sha256 | sha512 | "
-	    "skein | edonr", "CHECKSUM", checksum_table);
+	    "skein", "CHECKSUM", checksum_table);
 	zprop_register_index(ZFS_PROP_DEDUP, "dedup", ZIO_CHECKSUM_OFF,
 	    PROP_INHERIT, ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME,
 	    "on | off | verify | sha256[,verify], sha512[,verify], "
-	    "skein[,verify], edonr,verify", "DEDUP", dedup_table);
+	    "skein[,verify]", "DEDUP", dedup_table);
 	zprop_register_index(ZFS_PROP_COMPRESSION, "compression",
 	    ZIO_COMPRESS_DEFAULT, PROP_INHERIT,
 	    ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME,