aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/pagelist.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/pagelist.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/pagelist.c')
-rw-r--r--fs/nfs/pagelist.c6
1 files changed, 3 insertions, 3 deletions
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)
95{ 95{
96 if (atomic_dec_and_test(&c->io_count)) { 96 if (atomic_dec_and_test(&c->io_count)) {
97 clear_bit(NFS_IO_INPROGRESS, &c->flags); 97 clear_bit(NFS_IO_INPROGRESS, &c->flags);
98 smp_mb__after_clear_bit(); 98 smp_mb__after_atomic();
99 wake_up_bit(&c->flags, NFS_IO_INPROGRESS); 99 wake_up_bit(&c->flags, NFS_IO_INPROGRESS);
100 } 100 }
101} 101}
@@ -193,9 +193,9 @@ void nfs_unlock_request(struct nfs_page *req)
193 printk(KERN_ERR "NFS: Invalid unlock attempted\n"); 193 printk(KERN_ERR "NFS: Invalid unlock attempted\n");
194 BUG(); 194 BUG();
195 } 195 }
196 smp_mb__before_clear_bit(); 196 smp_mb__before_atomic();
197 clear_bit(PG_BUSY, &req->wb_flags); 197 clear_bit(PG_BUSY, &req->wb_flags);
198 smp_mb__after_clear_bit(); 198 smp_mb__after_atomic();
199 wake_up_bit(&req->wb_flags, PG_BUSY); 199 wake_up_bit(&req->wb_flags, PG_BUSY);
200} 200}
201 201