svn commit: r328233 - in vendor/illumos/dist: lib/libzfs/common man/man1m

[Alexander Motin]

Author: mav
Date: Sun Jan 21 23:57:41 2018
New Revision: 328233
URL: https://svnweb.freebsd.org/changeset/base/328233

Log:
  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.
  
  Also reported as: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=222199
  
  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>

Modified:
  vendor/illumos/dist/lib/libzfs/common/libzfs_dataset.c
  vendor/illumos/dist/man/man1m/zfs.1m

Modified: vendor/illumos/dist/lib/libzfs/common/libzfs_dataset.c
==============================================================================
--- vendor/illumos/dist/lib/libzfs/common/libzfs_dataset.c	Sun Jan 21 23:53:56 2018	(r328232)
+++ vendor/illumos/dist/lib/libzfs/common/libzfs_dataset.c	Sun Jan 21 23:57:41 2018	(r328233)
@@ -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.
  */
@@ -3476,6 +3476,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:
 			/*

Modified: vendor/illumos/dist/man/man1m/zfs.1m
==============================================================================
--- vendor/illumos/dist/man/man1m/zfs.1m	Sun Jan 21 23:53:56 2018	(r328232)
+++ vendor/illumos/dist/man/man1m/zfs.1m	Sun Jan 21 23:57:41 2018	(r328233)
@@ -28,7 +28,7 @@
 .\" Copyright (c) 2014 Integros [integros.com]
 .\" Copyright 2017 Nexenta Systems, Inc.
 .\"
-.Dd September 16, 2016
+.Dd December 6, 2017
 .Dt ZFS 1M
 .Os
 .Sh NAME
@@ -997,6 +997,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 Xo
 .Sy compression Ns = Ns Sy on Ns | Ns Sy off Ns | Ns Sy gzip Ns | Ns
 .Sy gzip- Ns Em N Ns | Ns Sy lz4 Ns | Ns Sy lzjb Ns | Ns Sy zle