Skip to content

Commit

Permalink
sunvdc: kill vdc_end_request()
Browse files Browse the repository at this point in the history
vdc_end_request() is a thin silly wrapper on top of
__blk_end_request().  Kill it.

[ Impact: cleanup ]

Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
  • Loading branch information
Tejun Heo authored and Jens Axboe committed Apr 28, 2009
1 parent cd4c34e commit 0442085
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions drivers/block/sunvdc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand All @@ -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);
Expand Down Expand Up @@ -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);
}
}

Expand Down

0 comments on commit 0442085

Please sign in to comment.