summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Sterba <dsterba@suse.com>2015-10-10 18:24:48 +0200
committerDavid Sterba <dsterba@suse.com>2015-10-10 18:24:48 +0200
commitb666a9cd993c6a49c4bf23a1ed476359c978f60b (patch)
tree891191e5484097c70b953b63029484628dea76c8
parentbtrfs: remove waitqueue_active check from btrfs_rm_dev_replace_unblocked (diff)
downloadlinux-b666a9cd993c6a49c4bf23a1ed476359c978f60b.tar.xz
linux-b666a9cd993c6a49c4bf23a1ed476359c978f60b.zip
btrfs: add barrier for waitqueue_active in clear_btree_io_tree
waitqueue_active should be preceded by a barrier, in this function we don't need to call it all the time. Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to '')
-rw-r--r--fs/btrfs/transaction.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index 74bc3338418b..e8e5b5a10719 100644
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -82,6 +82,12 @@ void btrfs_put_transaction(struct btrfs_transaction *transaction)
static void clear_btree_io_tree(struct extent_io_tree *tree)
{
spin_lock(&tree->lock);
+ /*
+ * Do a single barrier for the waitqueue_active check here, the state
+ * of the waitqueue should not change once clear_btree_io_tree is
+ * called.
+ */
+ smp_mb();
while (!RB_EMPTY_ROOT(&tree->state)) {
struct rb_node *node;
struct extent_state *state;