This patch converts s390 to use blk_end_request().
Signed-off-by: Kiyoshi Ueda <k-ueda@xxxxxxxxxxxxx>
Signed-off-by: Jun'ichi Nomura <j-nomura@xxxxxxxxxxxxx>
---
drivers/s390/block/dasd.c | 4 +---
drivers/s390/char/tape_block.c | 3 +--
2 files changed, 2 insertions(+), 5 deletions(-)
diff -rupN 18-mmc-caller-change/drivers/s390/block/dasd.c 19-s390-caller-change/drivers/s390/block/dasd.c
--- 18-mmc-caller-change/drivers/s390/block/dasd.c 2007-08-27 21:32:35.000000000 -0400
+++ 19-s390-caller-change/drivers/s390/block/dasd.c 2007-09-10 18:09:25.000000000 -0400
@@ -1080,10 +1080,8 @@ dasd_int_handler(struct ccw_device *cdev
static inline void
dasd_end_request(struct request *req, int uptodate)
{
- if (end_that_request_first(req, uptodate, req->hard_nr_sectors))
+ if (__blk_end_request(req, uptodate, blk_rq_size(req)))
BUG();
- add_disk_randomness(req->rq_disk);
- end_that_request_last(req, uptodate);
}
/*
diff -rupN 18-mmc-caller-change/drivers/s390/char/tape_block.c 19-s390-caller-change/drivers/s390/char/tape_block.c
--- 18-mmc-caller-change/drivers/s390/char/tape_block.c 2007-08-27 21:32:35.000000000 -0400
+++ 19-s390-caller-change/drivers/s390/char/tape_block.c 2007-09-10 18:09:25.000000000 -0400
@@ -76,9 +76,8 @@ tapeblock_trigger_requeue(struct tape_de
static void
tapeblock_end_request(struct request *req, int uptodate)
{
- if (end_that_request_first(req, uptodate, req->hard_nr_sectors))
+ if (__blk_end_request(req, uptodate, blk_rq_size(req)))
BUG();
- end_that_request_last(req, uptodate);
}
static void
-
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
