svn commit: r323002 - head/sys/cddl/contrib/opensolaris/common/zfs

[Ed Maste]

Author: emaste
Date: Tue Aug 29 22:24:22 2017
New Revision: 323002
URL: https://svnweb.freebsd.org/changeset/base/323002

Log:
  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'
  
  PR:		204055
  Submitted by:	Fabian Keil
  Approved by:	allanjude
  Obtained from:	ElectroBSD
  MFC after:	1 week

Modified:
  head/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c

Modified: head/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c	Tue Aug 29 21:45:00 2017	(r323001)
+++ head/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c	Tue Aug 29 22:24:22 2017	(r323002)
@@ -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,