diff options
| author | David Sterba <dsterba@suse.com> | 2017-07-21 19:15:59 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2017-07-21 19:15:59 +0200 |
| commit | 8c406a80725d63db2ca2209a2c845f98da6f098f (patch) | |
| tree | 96f8fdb093bab76d1e061ceecae44c04ee034089 | |
| parent | 3271f0893477eeb0040458b6ad31d05cd9ffb757 (diff) | |
| parent | 26397a4ad1d57cf1e218fd197846bb05eb2b787b (diff) | |
Merge branch 'fix/wait-io' into for-next-next-v4.14-20170721
| -rw-r--r-- | fs/btrfs/inode.c | 4 | ||||
| -rw-r--r-- | fs/btrfs/scrub.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 078fb4c2f5f1..04ee3720afc4 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -8134,7 +8134,7 @@ next_block_or_try_again: goto next; } - wait_for_completion(&done.done); + wait_for_completion_io(&done.done); if (!done.uptodate) { /* We might have another mirror, so try again */ @@ -8248,7 +8248,7 @@ try_again: goto next; } - wait_for_completion(&done.done); + wait_for_completion_io(&done.done); if (!done.uptodate) { /* We might have another mirror, so try again */ diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c index 18fa99782ad0..7bce7b43c48b 100644 --- a/fs/btrfs/scrub.c +++ b/fs/btrfs/scrub.c @@ -1704,7 +1704,7 @@ static int scrub_submit_raid56_bio_wait(struct btrfs_fs_info *fs_info, if (ret) return ret; - wait_for_completion(&done.event); + wait_for_completion_io(&done.event); if (done.error) return -EIO; |