diff options
| author | delphij <delphij@FreeBSD.org> | 2013-03-01 22:20:13 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2013-03-01 22:20:13 +0000 |
| commit | cfe29a2eeb5894e142b69de584de6a99e5a432c9 (patch) | |
| tree | 1478bb57ed5d3253777e82264244ea2948364b2f | |
| parent | 55ff3cee07ed79aca01bab6297b24f104a622058 (diff) | |
| download | FreeBSD-src-cfe29a2eeb5894e142b69de584de6a99e5a432c9.zip FreeBSD-src-cfe29a2eeb5894e142b69de584de6a99e5a432c9.tar.gz | |
MFV r247575:
Import a fix tighten assertion on SPA versions from vendor (Illumos).
Illumos ZFS issue:
3543 Feature flags causes assertion in spa.c to miss certain cases
MFC after: 2 weeks
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c index 92b7e06..ecfc1b0 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c @@ -6018,7 +6018,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; @@ -6559,7 +6559,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; |
