From f71ef9b686914af52bee614dbd0c1b9c0d2bc6cb Mon Sep 17 00:00:00 2001 From: Mark Johnston Date: Tue, 6 Nov 2018 17:32:25 +0000 Subject: [PATCH] Use plain atomic_{add,subtract} when that's sufficient. CID: 1386920 MFC after: 2 weeks --- sys/dev/mrsas/mrsas.h | 4 ++-- sys/kern/uipc_mqueue.c | 2 +- sys/kern/vfs_bio.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/dev/mrsas/mrsas.h b/sys/dev/mrsas/mrsas.h index 672b177ba90..280e1ed2f27 100644 --- a/sys/dev/mrsas/mrsas.h +++ b/sys/dev/mrsas/mrsas.h @@ -612,8 +612,8 @@ typedef union { #define mrsas_atomic_read(v) atomic_load_acq_int(&(v)->val) #define mrsas_atomic_set(v,i) atomic_store_rel_int(&(v)->val, i) -#define mrsas_atomic_dec(v) atomic_fetchadd_int(&(v)->val, -1) -#define mrsas_atomic_inc(v) atomic_fetchadd_int(&(v)->val, 1) +#define mrsas_atomic_dec(v) atomic_subtract_int(&(v)->val, 1) +#define mrsas_atomic_inc(v) atomic_add_int(&(v)->val, 1) /* IOCInit Request message */ typedef struct _MPI2_IOC_INIT_REQUEST { diff --git a/sys/kern/uipc_mqueue.c b/sys/kern/uipc_mqueue.c index 4751635e2ae..2f5cad6466d 100644 --- a/sys/kern/uipc_mqueue.c +++ b/sys/kern/uipc_mqueue.c @@ -393,7 +393,7 @@ mqnode_free(struct mqfs_node *node) static __inline void mqnode_addref(struct mqfs_node *node) { - atomic_fetchadd_int(&node->mn_refcount, 1); + atomic_add_int(&node->mn_refcount, 1); } static __inline void diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index 83e67207dc9..ea322343d89 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -1656,7 +1656,7 @@ buf_alloc(struct bufdomain *bd) if (freebufs > 0) bp = uma_zalloc(buf_zone, M_NOWAIT); if (bp == NULL) { - atomic_fetchadd_int(&bd->bd_freebuffers, 1); + atomic_add_int(&bd->bd_freebuffers, 1); bufspace_daemon_wakeup(bd); counter_u64_add(numbufallocfails, 1); return (NULL);