Date: Thu, 24 Oct 2019 14:57:38 +0000 (UTC) From: Andriy Gapon <avg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r354022 - stable/12/sys/cddl/contrib/opensolaris/uts/common/fs/zfs Message-ID: <201910241457.x9OEvdsM026367@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: avg Date: Thu Oct 24 14:57:38 2019 New Revision: 354022 URL: https://svnweb.freebsd.org/changeset/base/354022 Log: MFC r353168: ZFS: unconditionally use atomic_swap_64 Modified: stable/12/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfeature.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfeature.c ============================================================================== --- stable/12/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfeature.c Thu Oct 24 14:18:06 2019 (r354021) +++ stable/12/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfeature.c Thu Oct 24 14:57:38 2019 (r354022) @@ -313,12 +313,8 @@ feature_sync(spa_t *spa, zfeature_info_t *feature, uin 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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201910241457.x9OEvdsM026367>