Mercurial > unleashed > prev-conversion
changeset 18844:30151770e575
uts: illumos rootfs should support salted cksum
illumos issue #8906
author | Toomas Soome <tsoome@me.com> |
---|---|
date | Mon, 16 Jul 2018 14:59:20 +0300 |
parents | 2f1019fa0103 |
children | db662ca8e8ac |
files | kernel/fs/zfs/zfs_ioctl.c share/man/man5/zpool-features.5 |
diffstat | 2 files changed, 4 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/kernel/fs/zfs/zfs_ioctl.c Mon Dec 04 12:26:50 2017 +0200 +++ b/kernel/fs/zfs/zfs_ioctl.c Mon Jul 16 14:59:20 2018 +0300 @@ -3826,16 +3826,7 @@ 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));
--- a/share/man/man5/zpool-features.5 Mon Dec 04 12:26:50 2017 +0200 +++ b/share/man/man5/zpool-features.5 Mon Jul 16 14:59:20 2018 +0300 @@ -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 "Nov 23, 2016" +.TH ZPOOL-FEATURES 5 "Jun 8, 2018" .SH NAME zpool\-features \- ZFS pool feature descriptions .SH DESCRIPTION @@ -507,9 +507,7 @@ 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 @@ -549,9 +547,7 @@ 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(8), \fBzpool\fR(8)