diff options
-rw-r--r-- | drivers/block/sunvdc.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/block/sunvdc.c b/drivers/block/sunvdc.c index 5861e33efe63..f59887c5ffbd 100644 --- a/drivers/block/sunvdc.c +++ b/drivers/block/sunvdc.c | |||
@@ -212,11 +212,6 @@ static void vdc_end_special(struct vdc_port *port, struct vio_disk_desc *desc) | |||
212 | vdc_finish(&port->vio, -err, WAITING_FOR_GEN_CMD); | 212 | vdc_finish(&port->vio, -err, WAITING_FOR_GEN_CMD); |
213 | } | 213 | } |
214 | 214 | ||
215 | static void vdc_end_request(struct request *req, int error, int num_sectors) | ||
216 | { | ||
217 | __blk_end_request(req, error, num_sectors << 9); | ||
218 | } | ||
219 | |||
220 | static void vdc_end_one(struct vdc_port *port, struct vio_dring_state *dr, | 215 | static void vdc_end_one(struct vdc_port *port, struct vio_dring_state *dr, |
221 | unsigned int index) | 216 | unsigned int index) |
222 | { | 217 | { |
@@ -239,7 +234,7 @@ static void vdc_end_one(struct vdc_port *port, struct vio_dring_state *dr, | |||
239 | 234 | ||
240 | rqe->req = NULL; | 235 | rqe->req = NULL; |
241 | 236 | ||
242 | vdc_end_request(req, (desc->status ? -EIO : 0), desc->size >> 9); | 237 | __blk_end_request(req, (desc->status ? -EIO : 0), desc->size); |
243 | 238 | ||
244 | if (blk_queue_stopped(port->disk->queue)) | 239 | if (blk_queue_stopped(port->disk->queue)) |
245 | blk_start_queue(port->disk->queue); | 240 | blk_start_queue(port->disk->queue); |
@@ -453,7 +448,7 @@ static void do_vdc_request(struct request_queue *q) | |||
453 | 448 | ||
454 | blkdev_dequeue_request(req); | 449 | blkdev_dequeue_request(req); |
455 | if (__send_request(req) < 0) | 450 | if (__send_request(req) < 0) |
456 | vdc_end_request(req, -EIO, req->hard_nr_sectors); | 451 | __blk_end_request_all(req, -EIO); |
457 | } | 452 | } |
458 | } | 453 | } |
459 | 454 | ||