From: Jeffrey Altman <jaltman@your-file-system.com>
Date: Thu, 8 May 2014 13:06:07 +0000 (-0400)
Subject: Windows: cm_Analyze retries vs CM_REQ_NORETRY (2)
X-Git-Tag: upstream/1.8.0_pre1^2~713
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=aad509a7e11432bbe8cf0a3a0adaa78d7f9c9da5;p=packages%2Fo%2Fopenafs.git

Windows: cm_Analyze retries vs CM_REQ_NORETRY (2)

Commit a1b5a1d42280753de13094006dcc130fede978a1 left out a critical
part of the patch.  The check for "retry < 2" when determining whether
retries should be skipped due to CM_REQ_NORETRY.

Change-Id: I9b750e2bab11d28813447b2ee92287b8dcfbbba3
Reviewed-on: http://gerrit.openafs.org/11131
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
---

diff --git a/src/WINNT/afsd/cm_conn.c b/src/WINNT/afsd/cm_conn.c
index 6a867fddf..341a9dd39 100644
--- a/src/WINNT/afsd/cm_conn.c
+++ b/src/WINNT/afsd/cm_conn.c
@@ -1378,7 +1378,7 @@ cm_Analyze(cm_conn_t *connp,
 
     /* If not allowed to retry, don't */
     if (dead_session ||
-        !forcing_new && (reqp->flags & CM_REQ_NORETRY) &&
+        !forcing_new && (retry < 2) && (reqp->flags & CM_REQ_NORETRY) &&
         !(errorCode > -64 && errorCode <= RX_INVALID_OPERATION))
         retry = 0;