Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 836f48c5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents bdeef61c 534ead70

drivers/ata/libata-eh.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -2028,8 +2028,9 @@ static void ata_eh_link_autopsy(struct ata_link *link) 
			qc->err_mask &= ~(AC_ERR_DEV | AC_ERR_OTHER);

			qc->err_mask &= ~(AC_ERR_DEV | AC_ERR_OTHER);





		/* determine whether the command is worth retrying */

		/* determine whether the command is worth retrying */

		if (!(qc->err_mask & AC_ERR_INVALID) &&

		if (qc->flags & ATA_QCFLAG_IO ||

		    ((qc->flags & ATA_QCFLAG_IO) || qc->err_mask != AC_ERR_DEV))

		    (!(qc->err_mask & AC_ERR_INVALID) &&

		     qc->err_mask != AC_ERR_DEV))

			qc->flags |= ATA_QCFLAG_RETRY;

			qc->flags |= ATA_QCFLAG_RETRY;





		/* accumulate error info */

		/* accumulate error info */