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/dev-replace.c | |
| parent | 62fb50ab7c903357c92cef2f7677235b92ac575f (diff) | |
| parent | ee86395458072760d62e66aad10a5e9e8902b8cf (diff) | |
| download | op-kernel-dev-6db4a7335dd701a0e20275440ee057d3db2a7ae3.zip op-kernel-dev-6db4a7335dd701a0e20275440ee057d3db2a7ae3.tar.gz | |
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/dev-replace.c')
| -rw-r--r-- | fs/btrfs/dev-replace.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c index a64ca94..1e668fb 100644 --- a/fs/btrfs/dev-replace.c +++ b/fs/btrfs/dev-replace.c @@ -454,8 +454,7 @@ static void btrfs_rm_dev_replace_blocked(struct btrfs_fs_info *fs_info) static void btrfs_rm_dev_replace_unblocked(struct btrfs_fs_info *fs_info) { clear_bit(BTRFS_FS_STATE_DEV_REPLACING, &fs_info->fs_state); - if (waitqueue_active(&fs_info->replace_wait)) - wake_up(&fs_info->replace_wait); + wake_up(&fs_info->replace_wait); } static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info, |
