svn commit: r337199 - vendor-sys/illumos/dist/uts/common/fs/zfs vendor/illumos/dist/man/man1m vendor/illumos/dist/man/man5

[Alexander Motin]

Author: mav
Date: Thu Aug  2 23:28:47 2018
New Revision: 337199
URL: https://svnweb.freebsd.org/changeset/base/337199

Log:
  8906 uts: illumos rootfs should support salted cksum
  
  illumos/illumos-gate at 0dd498c0020c4a0dd34d350b07f97399a475d102
  
  Reviewed by: C Fraire <cfraire at me.com>
  Reviewed by: Robert Mustacchi <rm at joyent.com>
  Reviewed by: Yuri Pankov <yuripv at yuripv.net>
  Approved by: Dan McDonald <danmcd at joyent.com>
  Author:     Toomas Soome <tsoome at me.com>

Modified:
  vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_ioctl.c

Changes in other areas also in this revision:
Modified:
  vendor/illumos/dist/man/man1m/zfs.1m
  vendor/illumos/dist/man/man5/zpool-features.5

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_ioctl.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_ioctl.c	Thu Aug  2 23:25:49 2018	(r337198)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_ioctl.c	Thu Aug  2 23:28:47 2018	(r337199)
@@ -4069,16 +4069,7 @@ zfs_check_settable(const char *dsname, nvpair_t *pair,
 
 		if ((err = spa_open(dsname, &spa, FTAG)) != 0)
 			return (err);
-		/*
-		 * Salted checksums are not supported on root pools.
-		 */
-		if (spa_bootfs(spa) != 0 &&
-		    intval < ZIO_CHECKSUM_FUNCTIONS &&
-		    (zio_checksum_table[intval].ci_flags &
-		    ZCHECKSUM_FLAG_SALTED)) {
-			spa_close(spa, FTAG);
-			return (SET_ERROR(ERANGE));
-		}
+
 		if (!spa_feature_is_enabled(spa, feature)) {
 			spa_close(spa, FTAG);
 			return (SET_ERROR(ENOTSUP));