This patch converts viocd to use blk_end_request(). Signed-off-by: Kiyoshi Ueda <k-ueda@xxxxxxxxxxxxx> Signed-off-by: Jun'ichi Nomura <j-nomura@xxxxxxxxxxxxx> --- drivers/cdrom/viocd.c | 5 +---- 1 files changed, 1 insertion(+), 4 deletions(-) diff -rupN 15-xen-caller-change/drivers/cdrom/viocd.c 16-viocd-caller-change/drivers/cdrom/viocd.c --- 15-xen-caller-change/drivers/cdrom/viocd.c 2007-08-27 21:32:35.000000000 -0400 +++ 16-viocd-caller-change/drivers/cdrom/viocd.c 2007-09-10 18:06:02.000000000 -0400 @@ -389,11 +389,8 @@ static void viocd_end_request(struct req if (!nsectors) nsectors = 1; - if (end_that_request_first(req, uptodate, nsectors)) + if (__blk_end_request(req, uptodate, nsectors << 9)) BUG(); - add_disk_randomness(req->rq_disk); - blkdev_dequeue_request(req); - end_that_request_last(req, uptodate); } static int rwreq; - To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html