svn commit: r340658 - in stable/12/sys: dev/mrsas kern

[Mark Johnston]

Author: markj
Date: Tue Nov 20 00:55:51 2018
New Revision: 340658
URL: https://svnweb.freebsd.org/changeset/base/340658

Log:
  MFC r340192:
  Use plain atomic_{add,subtract} when that's sufficient.

Modified:
  stable/12/sys/dev/mrsas/mrsas.h
  stable/12/sys/kern/uipc_mqueue.c
  stable/12/sys/kern/vfs_bio.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/dev/mrsas/mrsas.h
==============================================================================
--- stable/12/sys/dev/mrsas/mrsas.h	Tue Nov 20 00:43:14 2018	(r340657)
+++ stable/12/sys/dev/mrsas/mrsas.h	Tue Nov 20 00:55:51 2018	(r340658)
@@ -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 {

Modified: stable/12/sys/kern/uipc_mqueue.c
==============================================================================
--- stable/12/sys/kern/uipc_mqueue.c	Tue Nov 20 00:43:14 2018	(r340657)
+++ stable/12/sys/kern/uipc_mqueue.c	Tue Nov 20 00:55:51 2018	(r340658)
@@ -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

Modified: stable/12/sys/kern/vfs_bio.c
==============================================================================
--- stable/12/sys/kern/vfs_bio.c	Tue Nov 20 00:43:14 2018	(r340657)
+++ stable/12/sys/kern/vfs_bio.c	Tue Nov 20 00:55:51 2018	(r340658)
@@ -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);