svn commit: r296523 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Alexander Motin
mav at FreeBSD.org
Tue Mar 8 17:58:04 UTC 2016
Author: mav
Date: Tue Mar 8 17:58:02 2016
New Revision: 296523
URL: https://svnweb.freebsd.org/changeset/base/296523
Log:
MFV r296522: 6541 Pool feature-flag check defeated if "verify" is included
in the dedup property value
Reviewed by: Matthew Ahrens <mahrens at delphix.com>
Reviewed by: Richard Laager <rlaager at wiktel.com>
Approved by: Robert Mustacchi <rm at joyent.com>
Author: ilovezfs <ilovezfs at icloud.com>
illumos/illumos-gate at 971640e6aa954c91b0706543741aa4570299f4d7
Modified:
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c
Directory Properties:
head/sys/cddl/contrib/opensolaris/ (props changed)
Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c Tue Mar 8 17:56:40 2016 (r296522)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c Tue Mar 8 17:58:02 2016 (r296523)
@@ -3973,7 +3973,7 @@ zfs_check_settable(const char *dsname, n
return (SET_ERROR(EINVAL));
/* check prop value is enabled in features */
- feature = zio_checksum_to_feature(intval);
+ feature = zio_checksum_to_feature(intval & ZIO_CHECKSUM_MASK);
if (feature == SPA_FEATURE_NONE)
break;
Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c Tue Mar 8 17:56:40 2016 (r296522)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c Tue Mar 8 17:58:02 2016 (r296523)
@@ -138,10 +138,16 @@ zio_checksum_info_t zio_checksum_table[Z
#endif
};
+/*
+ * The flag corresponding to the "verify" in dedup=[checksum,]verify
+ * must be cleared first, so callers should use ZIO_CHECKSUM_MASK.
+ */
spa_feature_t
zio_checksum_to_feature(enum zio_checksum cksum)
{
#ifdef illumos
+ VERIFY((cksum & ~ZIO_CHECKSUM_MASK) == 0);
+
switch (cksum) {
case ZIO_CHECKSUM_SHA512:
return (SPA_FEATURE_SHA512);
More information about the svn-src-all
mailing list