From: Petros Koutoupis <petros@petroskoutoupis.com>
Date: Mon, 30 Oct 2017 21:38:10 +0000 (-0500)
Subject: scsi: scsi_error: DID_SOFT_ERROR comment clean up
X-Git-Tag: v4.15-rc1~125^2~26
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ad95028a2e88e59fadda79141e74546d12ba3b4b;p=thirdparty%2Fkernel%2Flinux.git

scsi: scsi_error: DID_SOFT_ERROR comment clean up

Updated comment. We are keeping track of maximum number of retries per
command via retries/allowed in struct scsi_cmnd. Corrected comment
positioning.

[mkp: applied by hand]

Signed-off-by: Petros Koutoupis <petros@petroskoutoupis.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
---

diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index d670027f598f9..ae0486332ea8e 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -1753,16 +1753,12 @@ int scsi_decide_disposition(struct scsi_cmnd *scmd)
 		 * that it indicates SUCCESS.
 		 */
 		return SUCCESS;
+	case DID_SOFT_ERROR:
 		/*
 		 * when the low level driver returns did_soft_error,
 		 * it is responsible for keeping an internal retry counter
 		 * in order to avoid endless loops (db)
-		 *
-		 * actually this is a bug in this function here.  we should
-		 * be mindful of the maximum number of retries specified
-		 * and not get stuck in a loop.
 		 */
-	case DID_SOFT_ERROR:
 		goto maybe_retry;
 	case DID_IMM_RETRY:
 		return NEEDS_RETRY;