diff options
| author | Chris Mason <clm@fb.com> | 2015-10-12 16:24:40 -0700 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2015-10-12 16:24:40 -0700 |
| commit | 6db4a7335dd701a0e20275440ee057d3db2a7ae3 (patch) | |
| tree | c0734d7411806ef91bfeb615bf528ffb349938fe /fs/btrfs/raid56.c | |
| parent | 62fb50ab7c903357c92cef2f7677235b92ac575f (diff) | |
| parent | ee86395458072760d62e66aad10a5e9e8902b8cf (diff) | |
| download | talos-op-linux-6db4a7335dd701a0e20275440ee057d3db2a7ae3.tar.gz talos-op-linux-6db4a7335dd701a0e20275440ee057d3db2a7ae3.zip | |
Merge branch 'fix/waitqueue-barriers' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.4
Diffstat (limited to 'fs/btrfs/raid56.c')
| -rw-r--r-- | fs/btrfs/raid56.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/btrfs/raid56.c b/fs/btrfs/raid56.c index fcf7265ca46f..1a33d3eb36de 100644 --- a/fs/btrfs/raid56.c +++ b/fs/btrfs/raid56.c @@ -810,7 +810,11 @@ static noinline void unlock_stripe(struct btrfs_raid_bio *rbio) } goto done_nolock; - } else if (waitqueue_active(&h->wait)) { + /* + * The barrier for this waitqueue_active is not needed, + * we're protected by h->lock and can't miss a wakeup. + */ + } else if (waitqueue_active(&h->wait)) { spin_unlock(&rbio->bio_list_lock); spin_unlock_irqrestore(&h->lock, flags); wake_up(&h->wait); |
