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/jbd2 | |
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/jbd2')
-rw-r--r-- | fs/jbd2/commit.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c index 5f26139a165a..6fac74349856 100644 --- a/fs/jbd2/commit.c +++ b/fs/jbd2/commit.c | |||
@@ -43,7 +43,7 @@ static void journal_end_buffer_io_sync(struct buffer_head *bh, int uptodate) | |||
43 | clear_buffer_uptodate(bh); | 43 | clear_buffer_uptodate(bh); |
44 | if (orig_bh) { | 44 | if (orig_bh) { |
45 | clear_bit_unlock(BH_Shadow, &orig_bh->b_state); | 45 | clear_bit_unlock(BH_Shadow, &orig_bh->b_state); |
46 | smp_mb__after_clear_bit(); | 46 | smp_mb__after_atomic(); |
47 | wake_up_bit(&orig_bh->b_state, BH_Shadow); | 47 | wake_up_bit(&orig_bh->b_state, BH_Shadow); |
48 | } | 48 | } |
49 | unlock_buffer(bh); | 49 | unlock_buffer(bh); |
@@ -239,7 +239,7 @@ static int journal_submit_data_buffers(journal_t *journal, | |||
239 | spin_lock(&journal->j_list_lock); | 239 | spin_lock(&journal->j_list_lock); |
240 | J_ASSERT(jinode->i_transaction == commit_transaction); | 240 | J_ASSERT(jinode->i_transaction == commit_transaction); |
241 | clear_bit(__JI_COMMIT_RUNNING, &jinode->i_flags); | 241 | clear_bit(__JI_COMMIT_RUNNING, &jinode->i_flags); |
242 | smp_mb__after_clear_bit(); | 242 | smp_mb__after_atomic(); |
243 | wake_up_bit(&jinode->i_flags, __JI_COMMIT_RUNNING); | 243 | wake_up_bit(&jinode->i_flags, __JI_COMMIT_RUNNING); |
244 | } | 244 | } |
245 | spin_unlock(&journal->j_list_lock); | 245 | spin_unlock(&journal->j_list_lock); |
@@ -277,7 +277,7 @@ static int journal_finish_inode_data_buffers(journal_t *journal, | |||
277 | } | 277 | } |
278 | spin_lock(&journal->j_list_lock); | 278 | spin_lock(&journal->j_list_lock); |
279 | clear_bit(__JI_COMMIT_RUNNING, &jinode->i_flags); | 279 | clear_bit(__JI_COMMIT_RUNNING, &jinode->i_flags); |
280 | smp_mb__after_clear_bit(); | 280 | smp_mb__after_atomic(); |
281 | wake_up_bit(&jinode->i_flags, __JI_COMMIT_RUNNING); | 281 | wake_up_bit(&jinode->i_flags, __JI_COMMIT_RUNNING); |
282 | } | 282 | } |
283 | 283 | ||