diff options
| author | Allan Jude <allanjude@FreeBSD.org> | 2020-06-19 17:59:55 +0000 |
|---|---|---|
| committer | Allan Jude <allanjude@FreeBSD.org> | 2020-06-19 17:59:55 +0000 |
| commit | 9598fc63e6ff264b11437c546e9e9afcd6492901 (patch) | |
| tree | 0a2928dc0482ab5adf1852c4f7f0e4f8911bdc59 /sys/cddl/contrib/opensolaris/uts/common/fs | |
| parent | 7f8437c3531f0afc8bc65023871be2e64c4e2195 (diff) | |
| download | src-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 'sys/cddl/contrib/opensolaris/uts/common/fs')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c index c84e6a207753..9cdc77b72024 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c @@ -4373,16 +4373,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)); |