diff options
| author | Gwendal Grignou <gwendal@google.com> | 2009-08-07 16:17:49 -0700 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2013-11-28 14:02:01 +0000 |
| commit | 36439570a28275c01999b884885cf6a0d65bec73 (patch) | |
| tree | cb4a87163714263f32bd613c6aba8c9ac1b57c07 /drivers/ata | |
| parent | 3a3703b885535fa42759353adc09b5302ea7581b (diff) | |
| download | kernel_samsung_smdk4412-36439570a28275c01999b884885cf6a0d65bec73.zip kernel_samsung_smdk4412-36439570a28275c01999b884885cf6a0d65bec73.tar.gz kernel_samsung_smdk4412-36439570a28275c01999b884885cf6a0d65bec73.tar.bz2 | |
libata: make ata_eh_qc_retry() bump scmd->allowed on bogus failures
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: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/libata-eh.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c index aea627e..7d1a478 100644 --- a/drivers/ata/libata-eh.c +++ b/drivers/ata/libata-eh.c @@ -1286,14 +1286,14 @@ void ata_eh_qc_complete(struct ata_queued_cmd *qc) * should be retried. To be used from EH. * * 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). */ void ata_eh_qc_retry(struct ata_queued_cmd *qc) { struct scsi_cmnd *scmd = qc->scsicmd; - if (!qc->err_mask && scmd->retries) - scmd->retries--; + if (!qc->err_mask) + scmd->allowed++; __ata_eh_qc_complete(qc); } |