diff options
| author | Chris Mason <clm@fb.com> | 2015-10-12 19:24:40 -0400 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2015-10-12 19:24:40 -0400 |
| commit | 6db4a7335dd701a0e20275440ee057d3db2a7ae3 (patch) | |
| tree | c0734d7411806ef91bfeb615bf528ffb349938fe /fs/btrfs/dev-replace.c | |
| parent | 62fb50ab7c903357c92cef2f7677235b92ac575f (diff) | |
| parent | ee86395458072760d62e66aad10a5e9e8902b8cf (diff) | |
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 a64ca942b63f..1e668fb7dd4c 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) | |||
| 454 | static void btrfs_rm_dev_replace_unblocked(struct btrfs_fs_info *fs_info) | 454 | static void btrfs_rm_dev_replace_unblocked(struct btrfs_fs_info *fs_info) |
| 455 | { | 455 | { |
| 456 | clear_bit(BTRFS_FS_STATE_DEV_REPLACING, &fs_info->fs_state); | 456 | clear_bit(BTRFS_FS_STATE_DEV_REPLACING, &fs_info->fs_state); |
| 457 | if (waitqueue_active(&fs_info->replace_wait)) | 457 | wake_up(&fs_info->replace_wait); |
| 458 | wake_up(&fs_info->replace_wait); | ||
| 459 | } | 458 | } |
| 460 | 459 | ||
| 461 | static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info, | 460 | static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info, |