Attachment 185880 Details for Bug 204055 – zfs: Do not advertise edonr which isn't supported yet

[patch] zfs: Do not advertise edonr which isn't supported yet

zfs-Do-not-advertise-edonr-which-isn-t-supported-yet.diff (text/plain), 2.00 KB, created by Fabian Keil on 2017-08-29 13:41:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Fabian Keil

Created: 2017-08-29 13:41:38 UTC

Size: 2.00 KB

patch

obsolete

>From eaf6d238dae0af2eeddc9f456e37af49d1bd11cc Mon Sep 17 00:00:00 2001
>From: Fabian Keil <fk@fabiankeil.de>
>Date: Fri, 23 Oct 2015 23:36:28 +0200
>Subject: [PATCH] zfs: Do not advertise edonr which isn't supported yet
>
>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 remains missing.
>
>Without this commit, zfs(8) correctly rejects edonr,
>the error message claims that it is supported, though:
>
>fk@r500 ~ $zfs set checksum=edonr tank
>cannot set property for 'tank': 'checksum' must be one of 'on | off | fletcher2 | fletcher4 | sha256 | sha512 | skein | edonr'
>
>Obtained from: ElectroBSD
>PR: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=204055
>PR submission date: 2015-10-27 (before sha512 and skein were added)
>---
> sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c b/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c
>index 079d86043f4d..2a4b18abb2a0 100644
>--- a/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c
>+++ b/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c
>@@ -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,
>-- 
>2.14.1
>

Actions: View | Diff

Attachments on bug 204055: 162496 | 185880