diff options
| author | Richard Yao <ryao@gentoo.org> | 2013-02-25 17:37:11 -0800 |
|---|---|---|
| committer | Christopher Siden <chris.siden@delphix.com> | 2013-02-25 17:37:11 -0800 |
| commit | 62eae88769b9eacda11c5d508d9d87deeaf0821c (patch) | |
| tree | 88dc61b37a24f9789f8c3b2bf28a34fe39acb494 /usr/src | |
| parent | 77372cb0f35e8d3615ca2e16044f033397e88e21 (diff) | |
| download | illumos-gate-62eae88769b9eacda11c5d508d9d87deeaf0821c.tar.gz | |
3543 Feature flags causes assertion in spa.c to miss certain cases
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Approved by: Christopher Siden <christopher.siden@delphix.com>
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/uts/common/fs/zfs/spa.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/uts/common/fs/zfs/spa.c b/usr/src/uts/common/fs/zfs/spa.c index fb68e91eed..151b78091a 100644 --- a/usr/src/uts/common/fs/zfs/spa.c +++ b/usr/src/uts/common/fs/zfs/spa.c @@ -5747,7 +5747,7 @@ spa_sync_version(void *arg1, void *arg2, dmu_tx_t *tx) */ 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; |