|
@@ -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;
|