[libata] ahci: Fix lack of command retry after a success error handler.

Bian Yu · Jeff Garzik · commit 1eaca39a8417 · 2013-01-14T13:05:17.000-05:00
It should be a mistake introduced by commit 8d899e7. qc->flags can't be set AC_ERR_* Signed-off-by: Bian Yu <bianyu@kedacom.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
@@ -2094,7 +2094,7 @@ static unsigned int ata_eh_speed_down(struct ata_device *dev,
  */
 static inline int ata_eh_worth_retry(struct ata_queued_cmd *qc)
 {
-	if (qc->flags & AC_ERR_MEDIA)
+	if (qc->err_mask & AC_ERR_MEDIA)
 		return 0;	/* don't retry media errors */
 	if (qc->flags & ATA_QCFLAG_IO)
 		return 1;	/* otherwise retry anything from fs stack */

Original file line number	Diff line number	Diff line change
`@@ -2094,7 +2094,7 @@ static unsigned int ata_eh_speed_down(struct ata_device *dev,`
`2094`	`2094`	`*/`
`2095`	`2095`	`static inline int ata_eh_worth_retry(struct ata_queued_cmd *qc)`
`2096`	`2096`	`{`
`2097`		`- if (qc->flags & AC_ERR_MEDIA)`
	`2097`	`+ if (qc->err_mask & AC_ERR_MEDIA)`
`2098`	`2098`	`return 0; /* don't retry media errors */`
`2099`	`2099`	`if (qc->flags & ATA_QCFLAG_IO)`
`2100`	`2100`	`return 1; /* otherwise retry anything from fs stack */`