This patch converts i2o_block to use blk_end_request().

Signed-off-by: Kiyoshi Ueda <[EMAIL PROTECTED]>
Signed-off-by: Jun'ichi Nomura <[EMAIL PROTECTED]>
---
 drivers/message/i2o/i2o_block.c |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diff -rupN 16-viocd-caller-change/drivers/message/i2o/i2o_block.c 
17-i2o-caller-change/drivers/message/i2o/i2o_block.c
--- 16-viocd-caller-change/drivers/message/i2o/i2o_block.c      2007-09-10 
17:32:13.000000000 -0400
+++ 17-i2o-caller-change/drivers/message/i2o/i2o_block.c        2007-09-10 
18:08:24.000000000 -0400
@@ -425,22 +425,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);
-
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to