[PATCH 21/27] blk_end_request: changing ide-scsi (take 2)

[Kiyoshi Ueda]

This patch converts ide-scsi to use blk_end_request().

Signed-off-by: Kiyoshi Ueda <k-ueda@xxxxxxxxxxxxx>
Signed-off-by: Jun'ichi Nomura <j-nomura@xxxxxxxxxxxxx>
---
 drivers/scsi/ide-scsi.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff -rupN 20-scsi-mid-caller-change/drivers/scsi/ide-scsi.c 21-ide-scsi-caller-change/drivers/scsi/ide-scsi.c
--- 20-scsi-mid-caller-change/drivers/scsi/ide-scsi.c	2007-09-10 17:32:15.000000000 -0400
+++ 21-ide-scsi-caller-change/drivers/scsi/ide-scsi.c	2007-09-10 18:13:51.000000000 -0400
@@ -1042,8 +1042,8 @@ static int idescsi_eh_reset (struct scsi
 	}
 
 	/* kill current request */
-	blkdev_dequeue_request(req);
-	end_that_request_last(req, 0);
+	if (__blk_end_request(req, 0, 0))
+		BUG();
 	if (blk_sense_request(req))
 		kfree(scsi->pc->buffer);
 	kfree(scsi->pc);
@@ -1052,8 +1052,8 @@ static int idescsi_eh_reset (struct scsi
 
 	/* now nuke the drive queue */
 	while ((req = elv_next_request(drive->queue))) {
-		blkdev_dequeue_request(req);
-		end_that_request_last(req, 0);
+		if (__blk_end_request(req, 0, 0))
+			BUG();
 	}
 
 	HWGROUP(drive)->rq = NULL;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/