From: Jeffrey Altman <jaltman@your-file-system.com>
Date: Wed, 16 May 2012 03:27:36 +0000 (-0400)
Subject: Windows: avoid duplicate work cm_Analyze
X-Git-Tag: upstream/1.8.0_pre1^2~2405
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=a9a768fb7ac06c887c45f6ed144c312fe357ab1e;p=packages%2Fo%2Fopenafs.git

Windows: avoid duplicate work cm_Analyze

During VNOVOL processing, if the volume is replicated and the
server reference status is "not busy", set the status to busy
and avoid calling cm_SetServerBusyStatus() because that function
mirrors the loop that is already being processed.

Change-Id: I1c92fd02fecc92c3dcd94a33eb87fe5c2fa254ae
Reviewed-on: http://gerrit.openafs.org/7411
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@secure-endpoints.com>
Tested-by: Jeffrey Altman <jaltman@secure-endpoints.com>
---

diff --git a/src/WINNT/afsd/cm_conn.c b/src/WINNT/afsd/cm_conn.c
index 881a75a75..8f865e00d 100644
--- a/src/WINNT/afsd/cm_conn.c
+++ b/src/WINNT/afsd/cm_conn.c
@@ -726,7 +726,8 @@ cm_Analyze(cm_conn_t *connp,
                         osi_Log2(afsd_logp, "VNOVOL received for volume %u from server %s",
                                  fidp->volume, osi_LogSaveString(afsd_logp,addr));
                         if (replicated) {
-                            cm_SetServerBusyStatus(serversp, serverp);
+                            if (tsrp->status == srv_not_busy)
+                                tsrp->status = srv_busy;
                         } else {
                             Sleep(2000);
                         }