blk_end_request: changing ide-scsi (take 4)

This patch converts ide-scsi to use blk_end_request interfaces.
Related 'uptodate' arguments are converted to 'error'.

Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Kiyoshi Ueda <k-ueda@ct.jp.nec.com>
Signed-off-by: Jun'ichi Nomura <j-nomura@ce.jp.nec.com>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/scsi/ide-scsi.c b/drivers/scsi/ide-scsi.c
index 02e91893064d..db8bc20539e1 100644
--- a/drivers/scsi/ide-scsi.c
+++ b/drivers/scsi/ide-scsi.c
@@ -919,8 +919,8 @@ static int idescsi_eh_reset (struct scsi_cmnd *cmd)
         }
 
         /* kill current request */
-        blkdev_dequeue_request(req);
-        end_that_request_last(req, 0);
+        if (__blk_end_request(req, -EIO, 0))
+                BUG();
         if (blk_sense_request(req))
                 kfree(scsi->pc->buffer);
         kfree(scsi->pc);
@@ -929,8 +929,8 @@ static int idescsi_eh_reset (struct scsi_cmnd *cmd)
 
         /* 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, -EIO, 0))
+                        BUG();
         }
 
         HWGROUP(drive)->rq = NULL;