1 files changed, 21 insertions, 3 deletions

diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index d1fbd59ead16..6d53cf9b3b6e 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -2047,6 +2047,26 @@ static unsigned int ata_eh_speed_down(struct ata_device *dev,
 }
 
 /**
+ *      ata_eh_worth_retry - analyze error and decide whether to retry
+ *      @qc: qc to possibly retry
+ *
+ *      Look at the cause of the error and decide if a retry
+ *      might be useful or not.  We don't want to retry media errors
+ *      because the drive itself has probably already taken 10-30 seconds
+ *      doing its own internal retries before reporting the failure.
+ */
+static inline int ata_eh_worth_retry(struct ata_queued_cmd *qc)
+{
+        if (qc->flags & AC_ERR_MEDIA)
+                return 0;       /* don't retry media errors */
+        if (qc->flags & ATA_QCFLAG_IO)
+                return 1;       /* otherwise retry anything from fs stack */
+        if (qc->err_mask & AC_ERR_INVALID)
+                return 0;       /* don't retry these */
+        return qc->err_mask != AC_ERR_DEV;  /* retry if not dev error */
+}
+
+/**
  *      ata_eh_link_autopsy - analyze error and determine recovery action
  *      @link: host link to perform autopsy on
  *
@@ -2120,9 +2140,7 @@ 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->flags & ATA_QCFLAG_IO ||
-                    (!(qc->err_mask & AC_ERR_INVALID) &&
-                     qc->err_mask != AC_ERR_DEV))
+                if (ata_eh_worth_retry(qc))
                         qc->flags |= ATA_QCFLAG_RETRY;
 
                 /* accumulate error info */