Mercurial > illumos > illumos-gate
changeset 13970:c9a5683da38e
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>
| author | Richard Yao <ryao@gentoo.org> |
|---|---|
| date | Mon, 25 Feb 2013 17:37:11 -0800 |
| parents | b2c7608044b7 |
| children | d1648d817bd6 |
| files | usr/src/uts/common/fs/zfs/spa.c |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/uts/common/fs/zfs/spa.c Fri Feb 22 01:23:09 2013 -0800 +++ b/usr/src/uts/common/fs/zfs/spa.c Mon Feb 25 17:37:11 2013 -0800 @@ -5747,7 +5747,7 @@ */ 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 @@ * 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;