svn commit: r248958 - stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Martin Matuska]

Author: mm
Date: Sun Mar 31 18:56:00 2013
New Revision: 248958
URL: http://svnweb.freebsd.org/changeset/base/248958

Log:
  MFC r247592 (delphij):
    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

Modified:
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/cddl/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)

Modified: stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
==============================================================================
--- stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c	Sun Mar 31 18:51:34 2013	(r248957)
+++ stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c	Sun Mar 31 18:56:00 2013	(r248958)
@@ -5995,7 +5995,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;
@@ -6517,7 +6517,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;