ide-tape,floppy: fix failed command completion after request sense
Impact: fix infinite retry loop After a command failed, ide-tape and floppy inserts REQUEST_SENSE in front of the failed command and according to the result, sets pc->retries, flags and errors. After REQUEST_SENSE is complete, the failed command is again at the front of the queue and if the verdict was to terminate the request, the issue functions tries to complete it directly by calling drive->pc_callback() and returning ide_stopped. However, drive->pc_callback() doesn't complete a request. It only prepares for completion of the request. As a result, this creates an infinite loop where the failed request is retried perpetually. Fix it by actually ending the request by calling ide_complete_rq(). Signed-off-by: Tejun Heo <tj@kernel.org>
This commit is contained in:
parent
765139ef5f
commit
08f370f0a2
|
@ -141,6 +141,7 @@ static ide_startstop_t ide_floppy_issue_pc(ide_drive_t *drive,
|
||||||
|
|
||||||
drive->failed_pc = NULL;
|
drive->failed_pc = NULL;
|
||||||
drive->pc_callback(drive, 0);
|
drive->pc_callback(drive, 0);
|
||||||
|
ide_complete_rq(drive, -EIO, blk_rq_bytes(drive->hwif->rq));
|
||||||
return ide_stopped;
|
return ide_stopped;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -643,6 +643,7 @@ static ide_startstop_t ide_tape_issue_pc(ide_drive_t *drive,
|
||||||
}
|
}
|
||||||
drive->failed_pc = NULL;
|
drive->failed_pc = NULL;
|
||||||
drive->pc_callback(drive, 0);
|
drive->pc_callback(drive, 0);
|
||||||
|
ide_complete_rq(drive, -EIO, blk_rq_bytes(drive->hwif->rq));
|
||||||
return ide_stopped;
|
return ide_stopped;
|
||||||
}
|
}
|
||||||
debug_log(DBG_SENSE, "Retry #%d, cmd = %02X\n", pc->retries, pc->c[0]);
|
debug_log(DBG_SENSE, "Retry #%d, cmd = %02X\n", pc->retries, pc->c[0]);
|
||||||
|
|
Loading…
Reference in New Issue