From ecc3be1fdf0839443355b66087384fdf197b3683 Mon Sep 17 00:00:00 2001 From: Xin LI Date: Wed, 20 Aug 2014 06:15:53 +0000 Subject: [PATCH] 5042 stop using deprecated atomic functions Reviewed by: Dan McDonald Approved by: Robert Mustacchi Author: Josef 'Jeff' Sipek illumos/illumos-gate@75d94465dbafa487b716482dc36d5150a4ec9853 --- uts/common/dtrace/systrace.c | 8 ++++---- uts/common/fs/vnode.c | 7 ++++--- uts/common/os/fm.c | 2 +- uts/common/sys/bitmap.h | 4 ++-- uts/common/sys/cpuvar.h | 4 ++-- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/uts/common/dtrace/systrace.c b/uts/common/dtrace/systrace.c index b864041c450..3d36ce95477 100644 --- a/uts/common/dtrace/systrace.c +++ b/uts/common/dtrace/systrace.c @@ -164,11 +164,11 @@ systrace_enable(void *arg, dtrace_id_t id, void *parg) return (0); } - (void) casptr(&sysent[sysnum].sy_callc, + (void) atomic_cas_ptr(&sysent[sysnum].sy_callc, (void *)systrace_sysent[sysnum].stsy_underlying, (void *)dtrace_systrace_syscall); #ifdef _SYSCALL32_IMPL - (void) casptr(&sysent32[sysnum].sy_callc, + (void) atomic_cas_ptr(&sysent32[sysnum].sy_callc, (void *)systrace_sysent32[sysnum].stsy_underlying, (void *)dtrace_systrace_syscall32); #endif @@ -184,12 +184,12 @@ systrace_disable(void *arg, dtrace_id_t id, void *parg) systrace_sysent[sysnum].stsy_return == DTRACE_IDNONE); if (disable) { - (void) casptr(&sysent[sysnum].sy_callc, + (void) atomic_cas_ptr(&sysent[sysnum].sy_callc, (void *)dtrace_systrace_syscall, (void *)systrace_sysent[sysnum].stsy_underlying); #ifdef _SYSCALL32_IMPL - (void) casptr(&sysent32[sysnum].sy_callc, + (void) atomic_cas_ptr(&sysent32[sysnum].sy_callc, (void *)dtrace_systrace_syscall32, (void *)systrace_sysent32[sysnum].stsy_underlying); #endif diff --git a/uts/common/fs/vnode.c b/uts/common/fs/vnode.c index d67d1642868..9cd8f0562bd 100644 --- a/uts/common/fs/vnode.c +++ b/uts/common/fs/vnode.c @@ -2837,11 +2837,12 @@ vn_setops(vnode_t *vp, vnodeops_t *vnodeops) op = vp->v_op; membar_consumer(); /* - * If vp->v_femhead == NULL, then we'll call casptr() to do the - * compare-and-swap on vp->v_op. If either fails, then FEM is + * If vp->v_femhead == NULL, then we'll call atomic_cas_ptr() to do + * the compare-and-swap on vp->v_op. If either fails, then FEM is * in effect on the vnode and we need to have FEM deal with it. */ - if (vp->v_femhead != NULL || casptr(&vp->v_op, op, vnodeops) != op) { + if (vp->v_femhead != NULL || atomic_cas_ptr(&vp->v_op, op, vnodeops) != + op) { fem_setvnops(vp, vnodeops); } } diff --git a/uts/common/os/fm.c b/uts/common/os/fm.c index eff91aee5e6..fbe45e833ef 100644 --- a/uts/common/os/fm.c +++ b/uts/common/os/fm.c @@ -374,7 +374,7 @@ fm_panic(const char *format, ...) { va_list ap; - (void) casptr((void *)&fm_panicstr, NULL, (void *)format); + (void) atomic_cas_ptr((void *)&fm_panicstr, NULL, (void *)format); #if defined(__i386) || defined(__amd64) fastreboot_disable_highpil(); #endif /* __i386 || __amd64 */ diff --git a/uts/common/sys/bitmap.h b/uts/common/sys/bitmap.h index d2592820b6d..8d7054954d0 100644 --- a/uts/common/sys/bitmap.h +++ b/uts/common/sys/bitmap.h @@ -171,9 +171,9 @@ extern int odd_parity(ulong_t); * to 0 otherwise. */ #define BT_ATOMIC_SET(bitmap, bitindex) \ - { atomic_or_long(&(BT_WIM(bitmap, bitindex)), BT_BIW(bitindex)); } + { atomic_or_ulong(&(BT_WIM(bitmap, bitindex)), BT_BIW(bitindex)); } #define BT_ATOMIC_CLEAR(bitmap, bitindex) \ - { atomic_and_long(&(BT_WIM(bitmap, bitindex)), ~BT_BIW(bitindex)); } + { atomic_and_ulong(&(BT_WIM(bitmap, bitindex)), ~BT_BIW(bitindex)); } #define BT_ATOMIC_SET_EXCL(bitmap, bitindex, result) \ { result = atomic_set_long_excl(&(BT_WIM(bitmap, bitindex)), \ diff --git a/uts/common/sys/cpuvar.h b/uts/common/sys/cpuvar.h index 6c07bcbc8a8..bdefd08e3ae 100644 --- a/uts/common/sys/cpuvar.h +++ b/uts/common/sys/cpuvar.h @@ -528,8 +528,8 @@ typedef ulong_t cpuset_t; /* a set of CPUs */ largest = (uint_t)(highbit(set) - 1); \ } -#define CPUSET_ATOMIC_DEL(set, cpu) atomic_and_long(&(set), ~CPUSET(cpu)) -#define CPUSET_ATOMIC_ADD(set, cpu) atomic_or_long(&(set), CPUSET(cpu)) +#define CPUSET_ATOMIC_DEL(set, cpu) atomic_and_ulong(&(set), ~CPUSET(cpu)) +#define CPUSET_ATOMIC_ADD(set, cpu) atomic_or_ulong(&(set), CPUSET(cpu)) #define CPUSET_ATOMIC_XADD(set, cpu, result) \ { result = atomic_set_long_excl(&(set), (cpu)); }