aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/write.c
diff options
context:
space:
mode:
authorPeter Zijlstra <peterz@infradead.org>2014-03-17 13:06:10 -0400
committerIngo Molnar <mingo@kernel.org>2014-04-18 08:20:48 -0400
commit4e857c58efeb99393cba5a5d0d8ec7117183137c (patch)
tree3f6fd464e4fddb2fe90374c075c9d06603cf8bbc /fs/nfs/write.c
parent1b15611e1c30b37abe393d411c316cd659920bf5 (diff)
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>
Diffstat (limited to 'fs/nfs/write.c')
-rw-r--r--fs/nfs/write.c4
1 files changed, 2 insertions, 2 deletions
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)
405 nfs_pageio_complete(&pgio); 405 nfs_pageio_complete(&pgio);
406 406
407 clear_bit_unlock(NFS_INO_FLUSHING, bitlock); 407 clear_bit_unlock(NFS_INO_FLUSHING, bitlock);
408 smp_mb__after_clear_bit(); 408 smp_mb__after_atomic();
409 wake_up_bit(bitlock, NFS_INO_FLUSHING); 409 wake_up_bit(bitlock, NFS_INO_FLUSHING);
410 410
411 if (err < 0) 411 if (err < 0)
@@ -1458,7 +1458,7 @@ static int nfs_commit_set_lock(struct nfs_inode *nfsi, int may_wait)
1458static void nfs_commit_clear_lock(struct nfs_inode *nfsi) 1458static void nfs_commit_clear_lock(struct nfs_inode *nfsi)
1459{ 1459{
1460 clear_bit(NFS_INO_COMMIT, &nfsi->flags); 1460 clear_bit(NFS_INO_COMMIT, &nfsi->flags);
1461 smp_mb__after_clear_bit(); 1461 smp_mb__after_atomic();
1462 wake_up_bit(&nfsi->flags, NFS_INO_COMMIT); 1462 wake_up_bit(&nfsi->flags, NFS_INO_COMMIT);
1463} 1463}
1464 1464