diff options
| author | Alexander Motin <mav@FreeBSD.org> | 2018-08-02 23:28:47 +0000 |
|---|---|---|
| committer | Alexander Motin <mav@FreeBSD.org> | 2018-08-02 23:28:47 +0000 |
| commit | 3a767198cc4d3f2aa5c3c2662195a39e50b80f77 (patch) | |
| tree | 533d10fec7e1a22506f461df9ba361c86dfd52f0 /uts | |
| parent | a7ea4fd35ea50b42bcc8ecd6a39df875667f95a0 (diff) | |
| download | src-3a767198cc4d3f2aa5c3c2662195a39e50b80f77.tar.gz src-3a767198cc4d3f2aa5c3c2662195a39e50b80f77.zip | |
8906 uts: illumos rootfs should support salted cksum
illumos/illumos-gate@0dd498c0020c4a0dd34d350b07f97399a475d102
Reviewed by: C Fraire <cfraire@me.com>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Yuri Pankov <yuripv@yuripv.net>
Approved by: Dan McDonald <danmcd@joyent.com>
Author: Toomas Soome <tsoome@me.com>
Notes
Notes:
svn path=/vendor-sys/illumos/dist/; revision=337199
Diffstat (limited to 'uts')
| -rw-r--r-- | uts/common/fs/zfs/zfs_ioctl.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/uts/common/fs/zfs/zfs_ioctl.c b/uts/common/fs/zfs/zfs_ioctl.c index 10473579a5ff..175938eeb888 100644 --- a/uts/common/fs/zfs/zfs_ioctl.c +++ b/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)); |