diff options
author | Peter Zijlstra <peterz@infradead.org> | 2014-03-17 13:06:10 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2014-04-18 08:20:48 -0400 |
commit | 4e857c58efeb99393cba5a5d0d8ec7117183137c (patch) | |
tree | 3f6fd464e4fddb2fe90374c075c9d06603cf8bbc /fs/gfs2/sys.c | |
parent | 1b15611e1c30b37abe393d411c316cd659920bf5 (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/gfs2/sys.c')
-rw-r--r-- | fs/gfs2/sys.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/gfs2/sys.c b/fs/gfs2/sys.c index de25d5577e5d..529d9a9eb897 100644 --- a/fs/gfs2/sys.c +++ b/fs/gfs2/sys.c | |||
@@ -333,7 +333,7 @@ static ssize_t block_store(struct gfs2_sbd *sdp, const char *buf, size_t len) | |||
333 | set_bit(DFL_BLOCK_LOCKS, &ls->ls_recover_flags); | 333 | set_bit(DFL_BLOCK_LOCKS, &ls->ls_recover_flags); |
334 | else if (val == 0) { | 334 | else if (val == 0) { |
335 | clear_bit(DFL_BLOCK_LOCKS, &ls->ls_recover_flags); | 335 | clear_bit(DFL_BLOCK_LOCKS, &ls->ls_recover_flags); |
336 | smp_mb__after_clear_bit(); | 336 | smp_mb__after_atomic(); |
337 | gfs2_glock_thaw(sdp); | 337 | gfs2_glock_thaw(sdp); |
338 | } else { | 338 | } else { |
339 | ret = -EINVAL; | 339 | ret = -EINVAL; |
@@ -482,7 +482,7 @@ static ssize_t jid_store(struct gfs2_sbd *sdp, const char *buf, size_t len) | |||
482 | rv = jid = -EINVAL; | 482 | rv = jid = -EINVAL; |
483 | sdp->sd_lockstruct.ls_jid = jid; | 483 | sdp->sd_lockstruct.ls_jid = jid; |
484 | clear_bit(SDF_NOJOURNALID, &sdp->sd_flags); | 484 | clear_bit(SDF_NOJOURNALID, &sdp->sd_flags); |
485 | smp_mb__after_clear_bit(); | 485 | smp_mb__after_atomic(); |
486 | wake_up_bit(&sdp->sd_flags, SDF_NOJOURNALID); | 486 | wake_up_bit(&sdp->sd_flags, SDF_NOJOURNALID); |
487 | out: | 487 | out: |
488 | spin_unlock(&sdp->sd_jindex_spin); | 488 | spin_unlock(&sdp->sd_jindex_spin); |