From owner-svn-src-vendor@freebsd.org  Sun Jan 21 23:57:43 2018
Return-Path: <owner-svn-src-vendor@freebsd.org>
Delivered-To: svn-src-vendor@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 25A59EC29E7;
 Sun, 21 Jan 2018 23:57:43 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 0079B821B5;
 Sun, 21 Jan 2018 23:57:43 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 39D16129AC;
 Sun, 21 Jan 2018 23:57:42 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0LNvgEB012021;
 Sun, 21 Jan 2018 23:57:42 GMT (envelope-from mav@FreeBSD.org)
Received: (from mav@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0LNvfxX012019;
 Sun, 21 Jan 2018 23:57:41 GMT (envelope-from mav@FreeBSD.org)
Message-Id: <201801212357.w0LNvfxX012019@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org
 using -f
From: Alexander Motin <mav@FreeBSD.org>
Date: Sun, 21 Jan 2018 23:57:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-vendor@freebsd.org
Subject: svn commit: r328233 - in vendor/illumos/dist: lib/libzfs/common
 man/man1m
X-SVN-Group: vendor
X-SVN-Commit-Author: mav
X-SVN-Commit-Paths: in vendor/illumos/dist: lib/libzfs/common man/man1m
X-SVN-Commit-Revision: 328233
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-vendor@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the vendor work area tree
 <svn-src-vendor.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-vendor>, 
 <mailto:svn-src-vendor-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-vendor/>
List-Post: <mailto:svn-src-vendor@freebsd.org>
List-Help: <mailto:svn-src-vendor-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-vendor>,
 <mailto:svn-src-vendor-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 21 Jan 2018 23:57:43 -0000

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@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@me.com>
  Reviewed by: Andy Stormont <astormont@racktopsystems.com>
  Approved by: Dan McDonald <danmcd@joyent.com>
  Author: Yuri Pankov <yuri.pankov@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@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