From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Sun, 23 Dec 2007 03:27:29 +0000 (+0000)
Subject: DEVEL15-windows-fix-cb-expiration-20071222
X-Git-Tag: openafs-devel-1_5_29~24
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=10e8a05fb2038b60c10a4c8ecef2791b47e502e3;p=packages%2Fo%2Fopenafs.git

DEVEL15-windows-fix-cb-expiration-20071222

LICENSE MIT

corrects cb expiration that was broken by the osi_Time() -> time() change
in delta windows-readonly-volume-callbacks-20071109


(cherry picked from commit 89203eb7065d7bd4e2a40f2afd5fab979ddf1008)
---

diff --git a/src/WINNT/afsd/cm_callback.c b/src/WINNT/afsd/cm_callback.c
index a9689ffbd..0e8cfb3cf 100644
--- a/src/WINNT/afsd/cm_callback.c
+++ b/src/WINNT/afsd/cm_callback.c
@@ -1842,7 +1842,7 @@ void cm_CheckCBExpiration(void)
         
     osi_Log0(afsd_logp, "CheckCBExpiration");
 
-    now = osi_Time();
+    now = time(NULL);
     lock_ObtainWrite(&cm_scacheLock);
     for (i=0; i<cm_data.scacheHashTableSize; i++) {
         for (scp = cm_data.scacheHashTablep[i]; scp; scp=scp->nextp) {
diff --git a/src/WINNT/afsd/cm_scache.c b/src/WINNT/afsd/cm_scache.c
index 6f24d636c..fe804f25d 100644
--- a/src/WINNT/afsd/cm_scache.c
+++ b/src/WINNT/afsd/cm_scache.c
@@ -494,7 +494,7 @@ cm_SuspendSCache(void)
      * without network, the stat cache item will still be
      * considered valid.
      */
-    now = osi_Time();
+    now = time(NULL);
 
     lock_ObtainWrite(&cm_scacheLock);
     for ( scp = cm_data.allSCachesp; scp; scp = scp->allNextp ) {