From c5fa0a5772d82ece74919bc7d2ab1415fb33f770 Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Tue, 28 Apr 2009 13:06:08 +0900 Subject: [PATCH] --- yaml --- r: 146991 b: refs/heads/master c: 044208506d35bd62396c4673176e2c12393905b8 h: refs/heads/master i: 146989: c14efd731b654857eb854bc15ae6c369ac4c8f8a 146987: 340043ebe887307218675b6c43888bcfc6464c73 146983: 7c0a71575af3108a1a2ff95f366a976ab986eeb3 146975: 5a212cce1b317be96049ae1e9dc1f17e4d718fd5 v: v3 --- [refs] | 2 +- trunk/drivers/block/sunvdc.c | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index fefd0171b0fa..3a862386ba3b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cd4c34ebec155e5c10f897d9bebf618248121e70 +refs/heads/master: 044208506d35bd62396c4673176e2c12393905b8 diff --git a/trunk/drivers/block/sunvdc.c b/trunk/drivers/block/sunvdc.c index 5861e33efe63..f59887c5ffbd 100644 --- a/trunk/drivers/block/sunvdc.c +++ b/trunk/drivers/block/sunvdc.c @@ -212,11 +212,6 @@ static void vdc_end_special(struct vdc_port *port, struct vio_disk_desc *desc) vdc_finish(&port->vio, -err, WAITING_FOR_GEN_CMD); } -static void vdc_end_request(struct request *req, int error, int num_sectors) -{ - __blk_end_request(req, error, num_sectors << 9); -} - static void vdc_end_one(struct vdc_port *port, struct vio_dring_state *dr, unsigned int index) { @@ -239,7 +234,7 @@ static void vdc_end_one(struct vdc_port *port, struct vio_dring_state *dr, rqe->req = NULL; - vdc_end_request(req, (desc->status ? -EIO : 0), desc->size >> 9); + __blk_end_request(req, (desc->status ? -EIO : 0), desc->size); if (blk_queue_stopped(port->disk->queue)) blk_start_queue(port->disk->queue); @@ -453,7 +448,7 @@ static void do_vdc_request(struct request_queue *q) blkdev_dequeue_request(req); if (__send_request(req) < 0) - vdc_end_request(req, -EIO, req->hard_nr_sectors); + __blk_end_request_all(req, -EIO); } }