From owner-svn-src-all@FreeBSD.ORG  Thu Mar 20 00:05:24 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 19F45474;
 Thu, 20 Mar 2014 00:05:24 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0634011E;
 Thu, 20 Mar 2014 00:05:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2K05NDW013176;
 Thu, 20 Mar 2014 00:05:23 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2K05NwE013175;
 Thu, 20 Mar 2014 00:05:23 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201403200005.s2K05NwE013175@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Thu, 20 Mar 2014 00:05:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r263401 -
 stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Mar 2014 00:05:24 -0000

Author: delphij
Date: Thu Mar 20 00:05:23 2014
New Revision: 263401
URL: http://svnweb.freebsd.org/changeset/base/263401

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

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

Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfeature.c
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfeature.c	Thu Mar 20 00:02:14 2014	(r263400)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfeature.c	Thu Mar 20 00:05:23 2014	(r263401)
@@ -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)