From owner-svn-src-all@FreeBSD.ORG  Thu Jan  2 03:24:44 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id D1DAD3D6;
 Thu,  2 Jan 2014 03:24:44 +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 BD0801EEC;
 Thu,  2 Jan 2014 03:24:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s023OikU080529;
 Thu, 2 Jan 2014 03:24:44 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s023Oi5T080528;
 Thu, 2 Jan 2014 03:24:44 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201401020324.s023Oi5T080528@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Thu, 2 Jan 2014 03:24:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r260181 -
 head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
X-SVN-Group: head
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, 02 Jan 2014 03:24:44 -0000

Author: delphij
Date: Thu Jan  2 03:24:44 2014
New Revision: 260181
URL: http://svnweb.freebsd.org/changeset/base/260181

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

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfeature.c

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfeature.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfeature.c	Thu Jan  2 02:20:10 2014	(r260180)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfeature.c	Thu Jan  2 03:24:44 2014	(r260181)
@@ -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)