summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/tree-log.c
diff options
context:
space:
mode:
authorDavid Sterba2015-10-10 18:35:10 +0200
committerDavid Sterba2015-10-10 18:35:10 +0200
commit33a9eca7e4a4c2c17aebbb11f0e506a48ebc30c9 (patch)
treed7651da94ff1ef4ad27ab0ac932665fd8ef7b41c /fs/btrfs/tree-log.c
parentbtrfs: add barrier for waitqueue_active in clear_btree_io_tree (diff)
downloadkernel-qcow2-linux-33a9eca7e4a4c2c17aebbb11f0e506a48ebc30c9.tar.gz
kernel-qcow2-linux-33a9eca7e4a4c2c17aebbb11f0e506a48ebc30c9.tar.xz
kernel-qcow2-linux-33a9eca7e4a4c2c17aebbb11f0e506a48ebc30c9.zip
btrfs: comment waitqueue_active implied by locks
Suggested-by: Chris Mason <clm@fb.com> Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/tree-log.c')
-rw-r--r--fs/btrfs/tree-log.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index 1bbaace73383..d0deb4643502 100644
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -2950,6 +2950,9 @@ out_wake_log_root:
atomic_set(&log_root_tree->log_commit[index2], 0);
mutex_unlock(&log_root_tree->log_mutex);
+ /*
+ * The barrier before waitqueue_active is implied by mutex_unlock
+ */
if (waitqueue_active(&log_root_tree->log_commit_wait[index2]))
wake_up(&log_root_tree->log_commit_wait[index2]);
out:
@@ -2961,6 +2964,9 @@ out:
atomic_set(&root->log_commit[index1], 0);
mutex_unlock(&root->log_mutex);
+ /*
+ * The barrier before waitqueue_active is implied by mutex_unlock
+ */
if (waitqueue_active(&root->log_commit_wait[index1]))
wake_up(&root->log_commit_wait[index1]);
return ret;