aboutsummaryrefslogtreecommitdiff
path: root/cddl/contrib
diff options
context:
space:
mode:
authorAllan Jude <allanjude@FreeBSD.org>2020-06-19 17:59:55 +0000
committerAllan Jude <allanjude@FreeBSD.org>2020-06-19 17:59:55 +0000
commit9598fc63e6ff264b11437c546e9e9afcd6492901 (patch)
tree0a2928dc0482ab5adf1852c4f7f0e4f8911bdc59 /cddl/contrib
parent7f8437c3531f0afc8bc65023871be2e64c4e2195 (diff)
downloadsrc-9598fc63e6ff264b11437c546e9e9afcd6492901.tar.gz
src-9598fc63e6ff264b11437c546e9e9afcd6492901.zip
ZFS: Allow setting checksum=skein on boot pools
PR: 245889 Reported by: delphij Sponsored by: Klara Inc.
Notes
Notes: svn path=/head/; revision=362396
Diffstat (limited to 'cddl/contrib')
-rw-r--r--cddl/contrib/opensolaris/cmd/zfs/zfs.86
-rw-r--r--cddl/contrib/opensolaris/cmd/zpool/zpool-features.73
2 files changed, 6 insertions, 3 deletions
diff --git a/cddl/contrib/opensolaris/cmd/zfs/zfs.8 b/cddl/contrib/opensolaris/cmd/zfs/zfs.8
index 999e10211bbe..33e0ca4b3040 100644
--- a/cddl/contrib/opensolaris/cmd/zfs/zfs.8
+++ b/cddl/contrib/opensolaris/cmd/zfs/zfs.8
@@ -1001,9 +1001,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
diff --git a/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 b/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7
index b40bf9b5b1c7..6fe0c18d4759 100644
--- a/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7
+++ b/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7
@@ -632,6 +632,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.
.It Sy allocation_classes
.Bl -column "READ\-ONLY COMPATIBLE" "com.intel:allocation_classes"
.It GUID Ta com.intel:allocation_classes