svn commit: r263402 - in stable: 8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs 9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Xin LI]

Author: delphij
Date: Thu Mar 20 00:06:16 2014
New Revision: 263402
URL: http://svnweb.freebsd.org/changeset/base/263402

Log:
  MFC r260181:
  
  Fix build on platforms where atomic_swap_64 is not available.

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

Changes in other areas also in this revision:
Modified:
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfeature.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/cddl/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)

Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfeature.c
==============================================================================
--- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfeature.c	Thu Mar 20 00:05:23 2014	(r263401)
+++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfeature.c	Thu Mar 20 00:06:16 2014	(r263402)
@@ -312,8 +312,12 @@ feature_sync(spa_t *spa, zfeature_info_t
 	if (feature->fi_feature != SPA_FEATURE_NONE) {
 		uint64_t *refcount_cache =
 		    &spa->spa_feat_refcount_cache[feature->fi_feature];
+#ifdef atomic_swap_64
 		VERIFY3U(*refcount_cache, ==,
 		    atomic_swap_64(refcount_cache, refcount));
+#else
+		*refcount_cache = refcount;
+#endif
 	}
 
 	if (refcount == 0)