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@0dd498c0020c4a0dd34d350b07f97399a475d102
  
  Reviewed by: C Fraire <[email protected]>
  Reviewed by: Robert Mustacchi <[email protected]>
  Reviewed by: Yuri Pankov <[email protected]>
  Approved by: Dan McDonald <[email protected]>
  Author:     Toomas Soome <[email protected]>

Modified:
  vendor/illumos/dist/man/man1m/zfs.1m
  vendor/illumos/dist/man/man5/zpool-features.5

Changes in other areas also in this revision:
Modified:
  vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_ioctl.c

Modified: vendor/illumos/dist/man/man1m/zfs.1m
==============================================================================
--- vendor/illumos/dist/man/man1m/zfs.1m        Thu Aug  2 23:25:49 2018        
(r337198)
+++ vendor/illumos/dist/man/man1m/zfs.1m        Thu Aug  2 23:28:47 2018        
(r337199)
@@ -29,7 +29,7 @@
 .\" Copyright 2017 Nexenta Systems, Inc.
 .\" Copyright 2018 Joyent, Inc.
 .\"
-.Dd December 6, 2017
+.Dd Feb 10, 2018
 .Dt ZFS 1M
 .Os
 .Sh NAME
@@ -1002,10 +1002,6 @@ 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

Modified: vendor/illumos/dist/man/man5/zpool-features.5
==============================================================================
--- vendor/illumos/dist/man/man5/zpool-features.5       Thu Aug  2 23:25:49 
2018        (r337198)
+++ vendor/illumos/dist/man/man5/zpool-features.5       Thu Aug  2 23:28:47 
2018        (r337199)
@@ -15,7 +15,7 @@
 .\" CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your
 .\" own identifying information:
 .\" Portions Copyright [yyyy] [name of copyright owner]
-.TH ZPOOL-FEATURES 5 "Aug 27, 2013"
+.TH ZPOOL-FEATURES 5 "Jun 8, 2018"
 .SH NAME
 zpool\-features \- ZFS pool feature descriptions
 .SH DESCRIPTION
@@ -561,8 +561,7 @@ can turn on the \fBsha512\fR checksum on any dataset u
 and will return to being \fBenabled\fR once all filesystems that have
 ever had their checksum set to \fBsha512\fR are destroyed.
 
-Booting off of pools utilizing SHA-512/256 is supported (provided that
-the updated GRUB stage2 module is installed).
+Booting off of pools utilizing SHA-512/256 is supported.
 
 .RE
 
@@ -596,9 +595,7 @@ can turn on the \fBskein\fR checksum on any dataset us
 and will return to being \fBenabled\fR once all filesystems that have
 ever had their checksum set to \fBskein\fR are destroyed.
 
-Booting off of pools using \fBskein\fR is \fBNOT\fR supported
--- any attempt to enable \fBskein\fR on a root pool will fail with an
-error.
+Booting off of pools using \fBskein\fR is supported.
 
 .RE
 
@@ -638,9 +635,7 @@ can turn on the \fBedonr\fR checksum on any dataset us
 and will return to being \fBenabled\fR once all filesystems that have
 ever had their checksum set to \fBedonr\fR are destroyed.
 
-Booting off of pools using \fBedonr\fR is \fBNOT\fR supported
--- any attempt to enable \fBedonr\fR on a root pool will fail with an
-error.
+Booting off of pools using \fBedonr\fR is supported.
 
 .SH "SEE ALSO"
 \fBzpool\fR(1M)
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"

Reply via email to