Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: libata: retry FS IOs even if it has failed with AC_ERR_INVALID
This commit is contained in:
commit
836f48c5f8
|
@ -2028,8 +2028,9 @@ static void ata_eh_link_autopsy(struct ata_link *link)
|
|||
qc->err_mask &= ~(AC_ERR_DEV | AC_ERR_OTHER);
|
||||
|
||||
/* determine whether the command is worth retrying */
|
||||
if (!(qc->err_mask & AC_ERR_INVALID) &&
|
||||
((qc->flags & ATA_QCFLAG_IO) || qc->err_mask != AC_ERR_DEV))
|
||||
if (qc->flags & ATA_QCFLAG_IO ||
|
||||
(!(qc->err_mask & AC_ERR_INVALID) &&
|
||||
qc->err_mask != AC_ERR_DEV))
|
||||
qc->flags |= ATA_QCFLAG_RETRY;
|
||||
|
||||
/* accumulate error info */
|
||||
|
|
Loading…
Reference in New Issue