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 a9689ff..0e8cfb3 100644 (file)
--- 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 6f24d63..fe804f2 100644 (file)
--- 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 ) {