diff options
author | Chris Mason <clm@fb.com> | 2014-06-10 16:06:56 -0400 |
---|---|---|
committer | Chris Mason <clm@fb.com> | 2014-06-10 16:10:47 -0400 |
commit | c7548af69d9ef71512eb52d8009521eba3e768fd (patch) | |
tree | 1e7976a13aacd138dc0197a89771b0e62f0b7ac1 /fs/btrfs | |
parent | 6eda71d0c030af0fc2f68aaa676e6d445600855b (diff) |
Btrfs: convert smp_mb__{before,after}_clear_bit
The new call is smp_mb__{before,after}_atomic. The __ gives us extra
protection from the atomic rays.
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs/btrfs')
-rw-r--r-- | fs/btrfs/transaction.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c index 1c54e2eb74ab..9630f10f8e1e 100644 --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c | |||
@@ -290,7 +290,7 @@ static int record_root_in_trans(struct btrfs_trans_handle *trans, | |||
290 | * done before we pop in the zero below | 290 | * done before we pop in the zero below |
291 | */ | 291 | */ |
292 | btrfs_init_reloc_root(trans, root); | 292 | btrfs_init_reloc_root(trans, root); |
293 | smp_mb__before_clear_bit(); | 293 | smp_mb__before_atomic(); |
294 | clear_bit(BTRFS_ROOT_IN_TRANS_SETUP, &root->state); | 294 | clear_bit(BTRFS_ROOT_IN_TRANS_SETUP, &root->state); |
295 | } | 295 | } |
296 | return 0; | 296 | return 0; |
@@ -1060,7 +1060,7 @@ static noinline int commit_fs_roots(struct btrfs_trans_handle *trans, | |||
1060 | 1060 | ||
1061 | /* see comments in should_cow_block() */ | 1061 | /* see comments in should_cow_block() */ |
1062 | clear_bit(BTRFS_ROOT_FORCE_COW, &root->state); | 1062 | clear_bit(BTRFS_ROOT_FORCE_COW, &root->state); |
1063 | smp_mb__after_clear_bit(); | 1063 | smp_mb__after_atomic(); |
1064 | 1064 | ||
1065 | if (root->commit_root != root->node) { | 1065 | if (root->commit_root != root->node) { |
1066 | list_add_tail(&root->dirty_list, | 1066 | list_add_tail(&root->dirty_list, |