tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 836f48c5 bdeef61c

+3 -2
+3 -2
drivers/ata/libata-eh.c
··· 2028 2028 qc->err_mask &= ~(AC_ERR_DEV | AC_ERR_OTHER); 2029 2029 2030 2030 /* determine whether the command is worth retrying */ 2031 - if (!(qc->err_mask & AC_ERR_INVALID) && 2032 - ((qc->flags & ATA_QCFLAG_IO) || qc->err_mask != AC_ERR_DEV)) 2031 + if (qc->flags & ATA_QCFLAG_IO || 2032 + (!(qc->err_mask & AC_ERR_INVALID) && 2033 + qc->err_mask != AC_ERR_DEV)) 2033 2034 qc->flags |= ATA_QCFLAG_RETRY; 2034 2035 2035 2036 /* accumulate error info */