X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=block%2Fblk-exec.c;h=e7062139612914b95917405fc3da52e4498f066d;hb=7a6742003f3c8650c4d3f9edcae1cf8a5cdda276;hp=c88202f973d944f7e9c847b13d48c8ce24c87230;hpb=98b7ff9a4977e4f4f451c30288b197ad79e5ab7f;p=~andy%2Flinux diff --git a/block/blk-exec.c b/block/blk-exec.c index c88202f973d..e7062139612 100644 --- a/block/blk-exec.c +++ b/block/blk-exec.c @@ -121,9 +121,9 @@ int blk_execute_rq(struct request_queue *q, struct gendisk *bd_disk, /* Prevent hang_check timer from firing at us during very long I/O */ hang_check = sysctl_hung_task_timeout_secs; if (hang_check) - while (!wait_for_completion_timeout(&wait, hang_check * (HZ/2))); + while (!wait_for_completion_io_timeout(&wait, hang_check * (HZ/2))); else - wait_for_completion(&wait); + wait_for_completion_io(&wait); if (rq->errors) err = -EIO;