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
This commit is contained in:
Martin Matuska 2013-03-01 20:48:07 +00:00
parent 1f06ad3c96
commit 1dd7ebb604

View File

@ -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;