diff options
| -rw-r--r-- | usr/src/man/man1m/zfs.1m | 6 | ||||
| -rw-r--r-- | usr/src/man/man5/zpool-features.5 | 13 | ||||
| -rw-r--r-- | usr/src/uts/common/fs/zfs/zfs_ioctl.c | 11 |
3 files changed, 6 insertions, 24 deletions
diff --git a/usr/src/man/man1m/zfs.1m b/usr/src/man/man1m/zfs.1m index 62ffd63404..27d4900eab 100644 --- a/usr/src/man/man1m/zfs.1m +++ b/usr/src/man/man1m/zfs.1m @@ -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 diff --git a/usr/src/man/man5/zpool-features.5 b/usr/src/man/man5/zpool-features.5 index c97bb19e65..e825955380 100644 --- a/usr/src/man/man5/zpool-features.5 +++ b/usr/src/man/man5/zpool-features.5 @@ -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 using the 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 using the 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 using the 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" \fBzfs\fR(1M), \fBzpool\fR(1M) diff --git a/usr/src/uts/common/fs/zfs/zfs_ioctl.c b/usr/src/uts/common/fs/zfs/zfs_ioctl.c index 10473579a5..175938eeb8 100644 --- a/usr/src/uts/common/fs/zfs/zfs_ioctl.c +++ b/usr/src/uts/common/fs/zfs/zfs_ioctl.c @@ -4069,16 +4069,7 @@ zfs_check_settable(const char *dsname, nvpair_t *pair, cred_t *cr) 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)); |