diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2014-03-17 18:06:10 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-04-18 14:20:48 +0200 |
| commit | 4e857c58efeb99393cba5a5d0d8ec7117183137c (patch) | |
| tree | 3f6fd464e4fddb2fe90374c075c9d06603cf8bbc /fs/nfs/pagelist.c | |
| parent | 1b15611e1c30b37abe393d411c316cd659920bf5 (diff) | |
| download | linux-stable-4e857c58efeb99393cba5a5d0d8ec7117183137c.tar.gz linux-stable-4e857c58efeb99393cba5a5d0d8ec7117183137c.tar.bz2 linux-stable-4e857c58efeb99393cba5a5d0d8ec7117183137c.zip | |
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.c | 6 |
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) { 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); } |