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>
This commit is contained in:
Chris Mason 2014-06-10 13:06:56 -07:00
parent 6eda71d0c0
commit c7548af69d
1 changed files with 2 additions and 2 deletions

View File

@ -290,7 +290,7 @@ static int record_root_in_trans(struct btrfs_trans_handle *trans,
* done before we pop in the zero below * done before we pop in the zero below
*/ */
btrfs_init_reloc_root(trans, root); btrfs_init_reloc_root(trans, root);
smp_mb__before_clear_bit(); smp_mb__before_atomic();
clear_bit(BTRFS_ROOT_IN_TRANS_SETUP, &root->state); clear_bit(BTRFS_ROOT_IN_TRANS_SETUP, &root->state);
} }
return 0; return 0;
@ -1060,7 +1060,7 @@ static noinline int commit_fs_roots(struct btrfs_trans_handle *trans,
/* see comments in should_cow_block() */ /* see comments in should_cow_block() */
clear_bit(BTRFS_ROOT_FORCE_COW, &root->state); clear_bit(BTRFS_ROOT_FORCE_COW, &root->state);
smp_mb__after_clear_bit(); smp_mb__after_atomic();
if (root->commit_root != root->node) { if (root->commit_root != root->node) {
list_add_tail(&root->dirty_list, list_add_tail(&root->dirty_list,