This patch converts i2o_block to use blk_end_request(). Signed-off-by: Kiyoshi Ueda <k-ueda@xxxxxxxxxxxxx> Signed-off-by: Jun'ichi Nomura <j-nomura@xxxxxxxxxxxxx> --- drivers/message/i2o/i2o_block.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) Index: 2.6.24-rc3-mm2/drivers/message/i2o/i2o_block.c =================================================================== --- 2.6.24-rc3-mm2.orig/drivers/message/i2o/i2o_block.c +++ 2.6.24-rc3-mm2/drivers/message/i2o/i2o_block.c @@ -426,22 +426,18 @@ static void i2o_block_end_request(struct struct request_queue *q = req->q; unsigned long flags; - if (end_that_request_chunk(req, uptodate, nr_bytes)) { + if (blk_end_request(req, uptodate, nr_bytes)) { int leftover = (req->hard_nr_sectors << KERNEL_SECTOR_SHIFT); if (blk_pc_request(req)) leftover = req->data_len; if (end_io_error(uptodate)) - end_that_request_chunk(req, 0, leftover); + blk_end_request(req, 0, leftover); } - add_disk_randomness(req->rq_disk); - spin_lock_irqsave(q->queue_lock, flags); - end_that_request_last(req, uptodate); - if (likely(dev)) { dev->open_queue_depth--; list_del(&ireq->queue); -- dm-devel mailing list dm-devel@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/dm-devel