lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

blk_end_request: changing ide-scsi (take 4)

Browse Source 
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>
This commit is contained in:
Kiyoshi Ueda
2007-12-11 17:49:29 -05:00
committed by Jens Axboe
parent 4c4e214861
commit 5a330e39b1
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/scsi/ide-scsi.c
View File

@@ -919,8 +919,8 @@ static int idescsi_eh_reset (struct scsi_cmnd *cmd)
} }
/* kill current request */ /* kill current request */
blkdev_dequeue_request(req); if (__blk_end_request(req, -EIO, 0))
end_that_request_last(req, 0); BUG();
if (blk_sense_request(req)) if (blk_sense_request(req))
kfree(scsi->pc->buffer); kfree(scsi->pc->buffer);
kfree(scsi->pc); kfree(scsi->pc);
@@ -929,8 +929,8 @@ static int idescsi_eh_reset (struct scsi_cmnd *cmd)
/* now nuke the drive queue */ /* now nuke the drive queue */
while ((req = elv_next_request(drive->queue))) { while ((req = elv_next_request(drive->queue))) {
blkdev_dequeue_request(req); if (__blk_end_request(req, -EIO, 0))
end_that_request_last(req, 0); BUG();
} }
HWGROUP(drive)->rq = NULL; HWGROUP(drive)->rq = NULL;