Skip to content

Commit

Permalink
blk_end_request: changing ide-scsi (take 4)
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Kiyoshi Ueda authored and Jens Axboe committed Jan 28, 2008
1 parent 4c4e214 commit 5a330e3
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/scsi/ide-scsi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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;
Expand Down

0 comments on commit 5a330e3

Please sign in to comment.