Attachment 162496 Details for Bug 204055 – zfs(8): Do not advertise sha512, skein and edonr which aren't supported yet

[patch] zfs(8): Do not advertise sha512, skein and edonr which aren't supported yet

zfs-Do-not-advertise-sha512-skein-and-edonr-yet.diff (text/plain), 1.62 KB, created by Fabian Keil on 2015-10-27 13:42:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Fabian Keil

Created: 2015-10-27 13:42:38 UTC

Size: 1.62 KB

patch

obsolete

>From 03ca89f2ca37796f6376bc62e5a490c38c161ae6 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 sha512, skein and edonr which aren't
> supported yet
>
>Obtained from: ElectroBSD
>---
> sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c | 14 ++++++++++----
> 1 file changed, 10 insertions(+), 4 deletions(-)
>
>diff --git a/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c b/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c
>index 20b54d8..57b82d0 100644
>--- a/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c
>+++ b/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c
>@@ -240,12 +240,18 @@ zfs_prop_init(void)
> 	zprop_register_index(ZFS_PROP_CHECKSUM, "checksum",
> 	    ZIO_CHECKSUM_DEFAULT, PROP_INHERIT, ZFS_TYPE_FILESYSTEM |
> 	    ZFS_TYPE_VOLUME,
>-	    "on | off | fletcher2 | fletcher4 | sha256 | sha512 | "
>-	    "skein | edonr", "CHECKSUM", checksum_table);
>+	    "on | off | fletcher2 | fletcher4 | sha256"
>+#ifdef illumos
>+	    " | sha512 | skein | edonr"
>+#endif
>+	    , "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);
>+	    "on | off | verify | sha256[,verify]"
>+#ifdef illumos
>+	    ", sha512[,verify], skein[,verify], edonr,verify"
>+#endif
>+	   , "DEDUP", dedup_table);
> 	zprop_register_index(ZFS_PROP_COMPRESSION, "compression",
> 	    ZIO_COMPRESS_DEFAULT, PROP_INHERIT,
> 	    ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME,
>-- 
>2.6.2
>

Actions: View | Diff

Attachments on bug 204055: 162496 | 185880