svn commit: r328234 - in head/cddl/contrib/opensolaris: cmd/zfs lib/libzfs/common

[Alexander Motin]

Author: mav
Date: Mon Jan 22 00:01:36 2018
New Revision: 328234
URL: https://svnweb.freebsd.org/changeset/base/328234

Log:
  MFV r328233:
  8898 creating fs with checksum=skein on the boot pools fails ungracefully
  
  illumos/illumos-gate at 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 at me.com>
  Reviewed by: Andy Stormont <astormont at racktopsystems.com>
  Approved by: Dan McDonald <danmcd at joyent.com>
  Author: Yuri Pankov <yuri.pankov at nexenta.com>
  
  PR:		222199

Modified:
  head/cddl/contrib/opensolaris/cmd/zfs/zfs.8
  head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
Directory Properties:
  head/cddl/contrib/opensolaris/   (props changed)
  head/cddl/contrib/opensolaris/lib/libzfs/   (props changed)

Modified: head/cddl/contrib/opensolaris/cmd/zfs/zfs.8
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/zfs/zfs.8	Sun Jan 21 23:57:41 2018	(r328233)
+++ head/cddl/contrib/opensolaris/cmd/zfs/zfs.8	Mon Jan 22 00:01:36 2018	(r328234)
@@ -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

Modified: head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
==============================================================================
--- head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c	Sun Jan 21 23:57:41 2018	(r328233)
+++ head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c	Mon Jan 22 00:01:36 2018	(r328234)
@@ -28,7 +28,7 @@
  * Copyright (c) 2013 Martin Matuska. All rights reserved.
  * Copyright (c) 2013 Steven Hartland. All rights reserved.
  * Copyright (c) 2014 Integros [integros.com]
- * Copyright 2016 Nexenta Systems, Inc.
+ * Copyright 2017 Nexenta Systems, Inc.
  * Copyright 2016 Igor Kozhukhov <ikozhukhov at gmail.com>
  * Copyright 2017 RackTop Systems.
  */
@@ -3522,6 +3522,10 @@ zfs_create(libzfs_handle_t *hdl, const char *path, zfs
 			    "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:
 			/*