From f50d3dffc2a85f958d9bb3360f6dddc7bf882b6c Mon Sep 17 00:00:00 2001 From: Vladimir Davydov Date: Thu, 14 Feb 2013 18:19:59 +0400 Subject: [PATCH] --- yaml --- r: 359521 b: refs/heads/master c: 5577022f4ed8973762450ebe7fe7ebfd953817db h: refs/heads/master i: 359519: eead25ad37fbde0a6f0c7b2ffdd6da475946620a v: v3 --- [refs] | 2 +- trunk/block/blk-exec.c | 4 ++-- trunk/block/blk-flush.c | 2 +- trunk/block/blk-lib.c | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index f1c909a5605b..cc57581c80c3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 686855f5d833178e518d79e7912cdb3268a9fa69 +refs/heads/master: 5577022f4ed8973762450ebe7fe7ebfd953817db diff --git a/trunk/block/blk-exec.c b/trunk/block/blk-exec.c index 74638ec234c8..f634de772b0c 100644 --- a/trunk/block/blk-exec.c +++ b/trunk/block/blk-exec.c @@ -120,9 +120,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; diff --git a/trunk/block/blk-flush.c b/trunk/block/blk-flush.c index 720ad607ff91..db8f1b507857 100644 --- a/trunk/block/blk-flush.c +++ b/trunk/block/blk-flush.c @@ -436,7 +436,7 @@ int blkdev_issue_flush(struct block_device *bdev, gfp_t gfp_mask, bio_get(bio); submit_bio(WRITE_FLUSH, bio); - wait_for_completion(&wait); + wait_for_completion_io(&wait); /* * The driver must store the error location in ->bi_sector, if diff --git a/trunk/block/blk-lib.c b/trunk/block/blk-lib.c index b3a1f2b70b31..d6f50d572565 100644 --- a/trunk/block/blk-lib.c +++ b/trunk/block/blk-lib.c @@ -126,7 +126,7 @@ int blkdev_issue_discard(struct block_device *bdev, sector_t sector, /* Wait for bios in-flight */ if (!atomic_dec_and_test(&bb.done)) - wait_for_completion(&wait); + wait_for_completion_io(&wait); if (!test_bit(BIO_UPTODATE, &bb.flags)) ret = -EIO; @@ -200,7 +200,7 @@ int blkdev_issue_write_same(struct block_device *bdev, sector_t sector, /* Wait for bios in-flight */ if (!atomic_dec_and_test(&bb.done)) - wait_for_completion(&wait); + wait_for_completion_io(&wait); if (!test_bit(BIO_UPTODATE, &bb.flags)) ret = -ENOTSUPP; @@ -262,7 +262,7 @@ int __blkdev_issue_zeroout(struct block_device *bdev, sector_t sector, /* Wait for bios in-flight */ if (!atomic_dec_and_test(&bb.done)) - wait_for_completion(&wait); + wait_for_completion_io(&wait); if (!test_bit(BIO_UPTODATE, &bb.flags)) /* One of bios in the batch was completed with error.*/