diff options
| author | mav <mav@FreeBSD.org> | 2018-02-18 00:23:12 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2018-02-18 00:23:12 +0000 |
| commit | c783dd8c749520515574b8fb0360fb44cfdc7c4c (patch) | |
| tree | 470d7b9a728a65279d97bf6f1a78b816fe73ec2b /cddl/contrib/opensolaris | |
| parent | 18358cf457388644a73038b9d7df14d3fc874ea9 (diff) | |
| download | FreeBSD-src-c783dd8c749520515574b8fb0360fb44cfdc7c4c.zip FreeBSD-src-c783dd8c749520515574b8fb0360fb44cfdc7c4c.tar.gz | |
MFC r328234: MFV r328233:
8898 creating fs with checksum=skein on the boot pools fails ungracefully
illumos/illumos-gate@9fa2266d9a78b8366e1cd2d5f050e8b5e37d558c
https://www.illumos.org/issues/8898:
# zfs create -o checksum=skein rpool/test
internal error: Result too large
Abort (core dumped)
Not a big deal per se, but should be handled correctly.
Reviewed by: Toomas Soome <tsoome@me.com>
Reviewed by: Andy Stormont <astormont@racktopsystems.com>
Approved by: Dan McDonald <danmcd@joyent.com>
Author: Yuri Pankov <yuri.pankov@nexenta.com>
PR: 222199
Diffstat (limited to 'cddl/contrib/opensolaris')
| -rw-r--r-- | cddl/contrib/opensolaris/cmd/zfs/zfs.8 | 6 | ||||
| -rw-r--r-- | cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/cddl/contrib/opensolaris/cmd/zfs/zfs.8 b/cddl/contrib/opensolaris/cmd/zfs/zfs.8 index ff43798..11bf80b 100644 --- a/cddl/contrib/opensolaris/cmd/zfs/zfs.8 +++ b/cddl/contrib/opensolaris/cmd/zfs/zfs.8 @@ -31,7 +31,7 @@ .\" .\" $FreeBSD$ .\" -.Dd September 16, 2016 +.Dd December 6, 2017 .Dt ZFS 8 .Os .Sh NAME @@ -974,6 +974,10 @@ Please see for more information on these algorithms. .Pp Changing this property affects only newly-written data. +.Pp +Salted checksum algorithms +.Pq Cm edonr , skein +are currently not supported for any filesystem on the boot pools. .It Sy compression Ns = Ns Cm on | off | lzjb | gzip | gzip- Ns Ar N | Cm zle | Cm lz4 Controls the compression algorithm used for this dataset. Setting compression to diff --git a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c index d49cb13..e308240 100644 --- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c +++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c @@ -29,7 +29,7 @@ * Copyright (c) 2013 Steven Hartland. All rights reserved. * Copyright (c) 2014 Integros [integros.com] * Copyright 2016 Igor Kozhukhov <ikozhukhov@gmail.com> - * Copyright 2016 Nexenta Systems, Inc. + * Copyright 2017 Nexenta Systems, Inc. * Copyright 2017 RackTop Systems. */ @@ -3522,6 +3522,10 @@ zfs_create(libzfs_handle_t *hdl, const char *path, zfs_type_t type, "pool must be upgraded to set this " "property or value")); return (zfs_error(hdl, EZFS_BADVERSION, errbuf)); + case ERANGE: + zfs_error_aux(hdl, dgettext(TEXT_DOMAIN, + "invalid property value(s) specified")); + return (zfs_error(hdl, EZFS_BADPROP, errbuf)); #ifdef _ILP32 case EOVERFLOW: /* |
