Piteball/android_kernel_samsung_msm8976
1
1
Fork 0
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git synced 2024-11-07 04:09:21 +00:00
Code Issues Projects Releases Wiki Activity

libata: make ata_eh_qc_retry() bump scmd->allowed on bogus failures

Browse source 
commit f13e220161e738c2710b9904dcb3cf8bb0bcce61 upstream.

libata EH decrements scmd->retries when the command failed for reasons
unrelated to the command itself so that, for example, commands aborted
due to suspend / resume cycle don't get penalized; however,
decrementing scmd->retries isn't enough for ATA passthrough commands.

Without this fix, ATA passthrough commands are not resend to the
drive, and no error is signalled to the caller because:

- allowed retry count is 1
- ata_eh_qc_complete fill the sense data, so result is valid
- sense data is filled with untouched ATA registers.

Signed-off-by: Gwendal Grignou <gwendal@google.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Gwendal Grignou 2009-08-07 16:17:49 -07:00 committed by Greg Kroah-Hartman
parent 01e608d727
commit 1946436e87
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/ata/libata-eh.c
View file

@ -1322,14 +1322,14 @@ void ata_eh_qc_complete(struct ata_queued_cmd *qc)
* should be retried. To be used from EH. * should be retried. To be used from EH.
* *
* SCSI midlayer limits the number of retries to scmd->allowed. * SCSI midlayer limits the number of retries to scmd->allowed.
* scmd->retries is decremented for commands which get retried * scmd->allowed is incremented for commands which get retried
* due to unrelated failures (qc->err_mask is zero). * due to unrelated failures (qc->err_mask is zero).
*/ */
void ata_eh_qc_retry(struct ata_queued_cmd *qc) void ata_eh_qc_retry(struct ata_queued_cmd *qc)
{ {
struct scsi_cmnd *scmd = qc->scsicmd; struct scsi_cmnd *scmd = qc->scsicmd;
if (!qc->err_mask && scmd->retries) if (!qc->err_mask)
scmd->retries--; scmd->allowed++;
__ata_eh_qc_complete(qc); __ata_eh_qc_complete(qc);
} }