From: Jeffrey Altman Date: Sat, 11 Dec 2010 12:19:54 +0000 (-0600) Subject: Windows: PerformanceTuningInterval Merge error X-Git-Tag: upstream/1.6.0.pre2^2~104 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=b8fc8d9ae5213377543a3b92671aeb44326426a4;p=packages%2Fo%2Fopenafs.git Windows: PerformanceTuningInterval Merge error Due to a merge error, if RankServerInterval was set via the registry, its value would also be used for the PerformanceTuningInterval. Fix it. Reviewed-on: http://gerrit.openafs.org/3500 Tested-by: BuildBot Reviewed-by: Derrick Brashear Reviewed-by: Jeffrey Altman Tested-by: Jeffrey Altman (cherry picked from commit 6229ffb7ae365174ccacabe00d1e986d2f9b2019) Change-Id: I7ed0ffbffc88c25e6b586d927c8422711d2bd7b8 Reviewed-on: http://gerrit.openafs.org/3800 Tested-by: BuildBot Reviewed-by: Derrick Brashear --- diff --git a/src/WINNT/afsd/cm_daemon.c b/src/WINNT/afsd/cm_daemon.c index f8284332d..201bc2d60 100644 --- a/src/WINNT/afsd/cm_daemon.c +++ b/src/WINNT/afsd/cm_daemon.c @@ -340,6 +340,10 @@ cm_DaemonCheckInit(void) dummyLen = sizeof(DWORD); code = RegQueryValueEx(parmKey, "daemonPerformanceTuningInterval", NULL, NULL, (BYTE *) &dummy, &dummyLen); + if (code == ERROR_SUCCESS) + cm_daemonPerformanceTuningInterval = dummy; + afsi_log("daemonPerformanceTuningInterval is %d", cm_daemonPerformanceTuningInterval); + dummyLen = sizeof(DWORD); code = RegQueryValueEx(parmKey, "daemonRankServerInterval", NULL, NULL, (BYTE *) &dummy, &dummyLen); @@ -347,10 +351,6 @@ cm_DaemonCheckInit(void) cm_daemonRankServerInterval = dummy; afsi_log("daemonRankServerInterval is %d", cm_daemonRankServerInterval); - if (code == ERROR_SUCCESS) - cm_daemonPerformanceTuningInterval = dummy; - afsi_log("daemonPerformanceTuningInterval is %d", cm_daemonPerformanceTuningInterval); - RegCloseKey(parmKey); if (cm_daemonPerformanceTuningInterval)