|
@@ -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);
|
|
|
}
|
|
|
}
|
|
|
|