From 828fc8fff7dbc032a3de2ca6b1f2608a87dc1130 Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Sun, 4 Sep 2011 14:58:23 -0400 Subject: [PATCH] Windows: permit offline volume check to be disabled Setting the registry value to 0 can now be used as a method of disabling the offline volume check. Reviewed-on: http://gerrit.openafs.org/5370 Reviewed-by: Jeffrey Altman Tested-by: Jeffrey Altman (cherry picked from commit 19a5b5e67c65f0a9109b0fb5410b5ba74ad85b41) Change-Id: I50dfa3c5387ba8a1cbdd3ca80f9e8dc03e92c404 Reviewed-on: http://gerrit.openafs.org/6036 Tested-by: BuildBot Reviewed-by: Jeffrey Altman Tested-by: Jeffrey Altman --- src/WINNT/afsd/cm_daemon.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/WINNT/afsd/cm_daemon.c b/src/WINNT/afsd/cm_daemon.c index 12ac24f64..80b8fc312 100644 --- a/src/WINNT/afsd/cm_daemon.c +++ b/src/WINNT/afsd/cm_daemon.c @@ -427,7 +427,8 @@ void cm_Daemon(long parm) lastDownServerCheck = now - cm_daemonCheckDownInterval/2 + (rand() % cm_daemonCheckDownInterval); lastUpServerCheck = now - cm_daemonCheckUpInterval/2 + (rand() % cm_daemonCheckUpInterval); lastTokenCacheCheck = now - cm_daemonTokenCheckInterval/2 + (rand() % cm_daemonTokenCheckInterval); - lastBusyVolCheck = now - cm_daemonCheckOfflineVolInterval/2 * (rand() % cm_daemonCheckOfflineVolInterval); + if (cm_daemonCheckOfflineVolInterval) + lastBusyVolCheck = now - cm_daemonCheckOfflineVolInterval/2 * (rand() % cm_daemonCheckOfflineVolInterval); if (cm_daemonPerformanceTuningInterval) lastPerformanceCheck = now - cm_daemonPerformanceTuningInterval/2 * (rand() % cm_daemonPerformanceTuningInterval); lastServerRankCheck = now - cm_daemonRankServerInterval/2 * (rand() % cm_daemonRankServerInterval); @@ -551,7 +552,8 @@ void cm_Daemon(long parm) now = osi_Time(); } - if ((bAddrChangeCheck || now > lastBusyVolCheck + cm_daemonCheckOfflineVolInterval) && + if ((bAddrChangeCheck || (cm_daemonCheckOfflineVolInterval && + now > lastBusyVolCheck + cm_daemonCheckOfflineVolInterval)) && daemon_ShutdownFlag == 0 && powerStateSuspended == 0) { lastBusyVolCheck = now; -- 2.39.5