Date: Fri, 1 Mar 2013 20:48:07 +0000 (UTC) From: Martin Matuska <mm@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r247575 - vendor-sys/illumos/dist/uts/common/fs/zfs Message-ID: <201303012048.r21Km7IK085259@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mm Date: Fri Mar 1 20:48:07 2013 New Revision: 247575 URL: http://svnweb.freebsd.org/changeset/base/247575 Log: Update vendor-sys/illumos/dist to illumos-gate 13970:c9a5683da38e Illumos ZFS issues: 3543 Feature flags causes assertion in spa.c to miss certain cases Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/spa.c Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/spa.c ============================================================================== --- vendor-sys/illumos/dist/uts/common/fs/zfs/spa.c Fri Mar 1 20:36:59 2013 (r247574) +++ vendor-sys/illumos/dist/uts/common/fs/zfs/spa.c Fri Mar 1 20:48:07 2013 (r247575) @@ -5747,7 +5747,7 @@ spa_sync_version(void *arg1, void *arg2, */ ASSERT(tx->tx_txg != TXG_INITIAL); - ASSERT(version <= SPA_VERSION); + ASSERT(SPA_VERSION_IS_SUPPORTED(version)); ASSERT(version >= spa_version(spa)); spa->spa_uberblock.ub_version = version; @@ -6276,7 +6276,7 @@ spa_upgrade(spa_t *spa, uint64_t version * future version would result in an unopenable pool, this shouldn't be * possible. */ - ASSERT(spa->spa_uberblock.ub_version <= SPA_VERSION); + ASSERT(SPA_VERSION_IS_SUPPORTED(spa->spa_uberblock.ub_version)); ASSERT(version >= spa->spa_uberblock.ub_version); spa->spa_uberblock.ub_version = version;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303012048.r21Km7IK085259>