arch: Mass conversion of smp_mb__*()

Mostly scripted conversion of the smp_mb__* barriers.

Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Link: http://lkml.kernel.org/n/tip-55dhyhocezdw1dg7u19hmh1u@git.kernel.org
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-arch@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>

8 files changed, 18 insertions, 18 deletions

diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index d9f3d067cd15..4a3d4ef76127 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -2032,9 +2032,9 @@ static void nfs_access_free_entry(struct nfs_access_entry *entry)
 {
         put_rpccred(entry->cred);
         kfree(entry);
-        smp_mb__before_atomic_dec();
+        smp_mb__before_atomic();
         atomic_long_dec(&nfs_access_nr_entries);
-        smp_mb__after_atomic_dec();
+        smp_mb__after_atomic();
 }
 
 static void nfs_access_free_list(struct list_head *head)
@@ -2082,9 +2082,9 @@ nfs_access_cache_scan(struct shrinker *shrink, struct shrink_control *sc)
                 else {
 remove_lru_entry:
                         list_del_init(&nfsi->access_cache_inode_lru);
-                        smp_mb__before_clear_bit();
+                        smp_mb__before_atomic();
                         clear_bit(NFS_INO_ACL_LRU_SET, &nfsi->flags);
-                        smp_mb__after_clear_bit();
+                        smp_mb__after_atomic();
                 }
                 spin_unlock(&inode->i_lock);
         }
@@ -2232,9 +2232,9 @@ void nfs_access_add_cache(struct inode *inode, struct nfs_access_entry *set)
         nfs_access_add_rbtree(inode, cache);
 
         /* Update accounting */
-        smp_mb__before_atomic_inc();
+        smp_mb__before_atomic();
         atomic_long_inc(&nfs_access_nr_entries);
-        smp_mb__after_atomic_inc();
+        smp_mb__after_atomic();
 
         /* Add inode to global LRU list */
         if (!test_bit(NFS_INO_ACL_LRU_SET, &NFS_I(inode)->flags)) {
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index 0c438973f3c8..e6f7398d2b3c 100644
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -1085,7 +1085,7 @@ int nfs_revalidate_mapping(struct inode *inode, struct address_space *mapping)
         trace_nfs_invalidate_mapping_exit(inode, ret);
 
         clear_bit_unlock(NFS_INO_INVALIDATING, bitlock);
-        smp_mb__after_clear_bit();
+        smp_mb__after_atomic();
         wake_up_bit(bitlock, NFS_INO_INVALIDATING);
 out:
         return ret;
diff --git a/fs/nfs/nfs4filelayoutdev.c b/fs/nfs/nfs4filelayoutdev.c
index efac602edb37..b9c61efe9660 100644
--- a/fs/nfs/nfs4filelayoutdev.c
+++ b/fs/nfs/nfs4filelayoutdev.c
@@ -789,9 +789,9 @@ static void nfs4_wait_ds_connect(struct nfs4_pnfs_ds *ds)
 
 static void nfs4_clear_ds_conn_bit(struct nfs4_pnfs_ds *ds)
 {
-        smp_mb__before_clear_bit();
+        smp_mb__before_atomic();
         clear_bit(NFS4DS_CONNECTING, &ds->ds_state);
-        smp_mb__after_clear_bit();
+        smp_mb__after_atomic();
         wake_up_bit(&ds->ds_state, NFS4DS_CONNECTING);
 }
 
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index 2349518eef2c..c0583b9bef71 100644
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
@@ -1140,9 +1140,9 @@ static int nfs4_run_state_manager(void *);
 
 static void nfs4_clear_state_manager_bit(struct nfs_client *clp)
 {
-        smp_mb__before_clear_bit();
+        smp_mb__before_atomic();
         clear_bit(NFS4CLNT_MANAGER_RUNNING, &clp->cl_state);
-        smp_mb__after_clear_bit();
+        smp_mb__after_atomic();
         wake_up_bit(&clp->cl_state, NFS4CLNT_MANAGER_RUNNING);
         rpc_wake_up(&clp->cl_rpcwaitq);
 }
diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c
index 2ffebf2081ce..03ed984ab4d8 100644
--- a/fs/nfs/pagelist.c
+++ b/fs/nfs/pagelist.c
@@ -95,7 +95,7 @@ nfs_iocounter_dec(struct nfs_io_counter *c)
 {
         if (atomic_dec_and_test(&c->io_count)) {
                 clear_bit(NFS_IO_INPROGRESS, &c->flags);
-                smp_mb__after_clear_bit();
+                smp_mb__after_atomic();
                 wake_up_bit(&c->flags, NFS_IO_INPROGRESS);
         }
 }
@@ -193,9 +193,9 @@ void nfs_unlock_request(struct nfs_page *req)
                 printk(KERN_ERR "NFS: Invalid unlock attempted\n");
                 BUG();
         }
-        smp_mb__before_clear_bit();
+        smp_mb__before_atomic();
         clear_bit(PG_BUSY, &req->wb_flags);
-        smp_mb__after_clear_bit();
+        smp_mb__after_atomic();
         wake_up_bit(&req->wb_flags, PG_BUSY);
 }
 
diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index cb53d450ae32..fd9536e494bc 100644
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -1810,7 +1810,7 @@ static void pnfs_clear_layoutcommitting(struct inode *inode)
         unsigned long *bitlock = &NFS_I(inode)->flags;
 
         clear_bit_unlock(NFS_INO_LAYOUTCOMMITTING, bitlock);
-        smp_mb__after_clear_bit();
+        smp_mb__after_atomic();
         wake_up_bit(bitlock, NFS_INO_LAYOUTCOMMITTING);
 }
 
diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h
index 023793909778..c3058a076596 100644
--- a/fs/nfs/pnfs.h
+++ b/fs/nfs/pnfs.h
@@ -275,7 +275,7 @@ pnfs_get_lseg(struct pnfs_layout_segment *lseg)
 {
         if (lseg) {
                 atomic_inc(&lseg->pls_refcount);
-                smp_mb__after_atomic_inc();
+                smp_mb__after_atomic();
         }
         return lseg;
 }
diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index 9a3b6a4cd6b9..ffb9459f180b 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -405,7 +405,7 @@ int nfs_writepages(struct address_space *mapping, struct writeback_control *wbc)
         nfs_pageio_complete(&pgio);
 
         clear_bit_unlock(NFS_INO_FLUSHING, bitlock);
-        smp_mb__after_clear_bit();
+        smp_mb__after_atomic();
         wake_up_bit(bitlock, NFS_INO_FLUSHING);
 
         if (err < 0)
@@ -1458,7 +1458,7 @@ static int nfs_commit_set_lock(struct nfs_inode *nfsi, int may_wait)
 static void nfs_commit_clear_lock(struct nfs_inode *nfsi)
 {
         clear_bit(NFS_INO_COMMIT, &nfsi->flags);
-        smp_mb__after_clear_bit();
+        smp_mb__after_atomic();
         wake_up_bit(&nfsi->flags, NFS_INO_COMMIT);
 }