diff options
author | David Sterba <dsterba@suse.com> | 2018-03-16 02:39:40 +0100 |
---|---|---|
committer | David Sterba <dsterba@suse.com> | 2018-03-31 02:01:06 +0200 |
commit | d1980131ca7f0776542f776ceb777cd01eb983e2 (patch) | |
tree | 0fae91ad3ab13a05c9075ab410e0414b736a73d9 /fs/btrfs/ctree.c | |
parent | a32bf9a30201f13097428a3327c7c67f678c760c (diff) | |
download | linux-stable-d1980131ca7f0776542f776ceb777cd01eb983e2.tar.gz linux-stable-d1980131ca7f0776542f776ceb777cd01eb983e2.tar.bz2 linux-stable-d1980131ca7f0776542f776ceb777cd01eb983e2.zip |
btrfs: update barrier in should_cow_block
Once there was a simple int force_cow that was used with the plain
barriers, and then converted to a bit, so we should use the appropriate
barrier helper.
Other variables in the complex if condition do not depend on a barrier,
so we should be fine in case the atomic barrier becomes a no-op.
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/ctree.c')
-rw-r--r-- | fs/btrfs/ctree.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c index 7c8faeb868f4..a2c9d21176e2 100644 --- a/fs/btrfs/ctree.c +++ b/fs/btrfs/ctree.c @@ -1441,8 +1441,8 @@ static inline int should_cow_block(struct btrfs_trans_handle *trans, if (btrfs_is_testing(root->fs_info)) return 0; - /* ensure we can see the force_cow */ - smp_rmb(); + /* Ensure we can see the FORCE_COW bit */ + smp_mb__before_atomic(); /* * We do not need to cow a block if |