Commit c7548af69d9ef71512eb52d8009521eba3e768fd
1 parent
6eda71d0c0
Exists in
ti-lsk-linux-4.1.y
and in
10 other branches
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>
Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff
fs/btrfs/transaction.c
| ... | ... | @@ -290,7 +290,7 @@ |
| 290 | 290 | * done before we pop in the zero below |
| 291 | 291 | */ |
| 292 | 292 | btrfs_init_reloc_root(trans, root); |
| 293 | - smp_mb__before_clear_bit(); | |
| 293 | + smp_mb__before_atomic(); | |
| 294 | 294 | clear_bit(BTRFS_ROOT_IN_TRANS_SETUP, &root->state); |
| 295 | 295 | } |
| 296 | 296 | return 0; |
| ... | ... | @@ -1060,7 +1060,7 @@ |
| 1060 | 1060 | |
| 1061 | 1061 | /* see comments in should_cow_block() */ |
| 1062 | 1062 | clear_bit(BTRFS_ROOT_FORCE_COW, &root->state); |
| 1063 | - smp_mb__after_clear_bit(); | |
| 1063 | + smp_mb__after_atomic(); | |
| 1064 | 1064 | |
| 1065 | 1065 | if (root->commit_root != root->node) { |
| 1066 | 1066 | list_add_tail(&root->dirty_list, |