svn commit: r363098 - in stable: 11/cddl/contrib/opensolaris/cmd/zfs 11/cddl/contrib/opensolaris/cmd/zpool 11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs 12/cddl/contrib/opensolaris/cmd/zfs 12/c...

[Allan Jude]

Author: allanjude
Date: Sat Jul 11 15:57:46 2020
New Revision: 363098
URL: https://svnweb.freebsd.org/changeset/base/363098

Log:
  MFC r362396
    ZFS: Allow setting checksum=skein on boot pools
  
  PR:		245889
  Reported by:	delphij
  Sponsored by:	Klara Inc.
  Event:		July 2020 Bugathon

Modified:
  stable/11/cddl/contrib/opensolaris/cmd/zfs/zfs.8
  stable/11/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7
  stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
Directory Properties:
  stable/11/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/12/cddl/contrib/opensolaris/cmd/zfs/zfs.8
  stable/12/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7
  stable/12/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/11/cddl/contrib/opensolaris/cmd/zfs/zfs.8
==============================================================================
--- stable/11/cddl/contrib/opensolaris/cmd/zfs/zfs.8	Sat Jul 11 15:32:53 2020	(r363097)
+++ stable/11/cddl/contrib/opensolaris/cmd/zfs/zfs.8	Sat Jul 11 15:57:46 2020	(r363098)
@@ -997,9 +997,9 @@ 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.
+The salted checksum algorithm
+.Pq Cm edonr
+is currently not supported on FreeBSD.
 .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: stable/11/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7
==============================================================================
--- stable/11/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7	Sat Jul 11 15:32:53 2020	(r363097)
+++ stable/11/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7	Sat Jul 11 15:57:46 2020	(r363098)
@@ -608,6 +608,9 @@ and will return to being
 once all filesystems that have ever had their checksum set to
 .Sy skein
 are destroyed.
+Booting off of pools using
+.Sy skein
+is supported.
 .El
 .Sh SEE ALSO
 .Xr zpool 8

Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
==============================================================================
--- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c	Sat Jul 11 15:32:53 2020	(r363097)
+++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c	Sat Jul 11 15:57:46 2020	(r363098)
@@ -4299,16 +4299,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));