windows-freelance-deadlock-20080809

LICENSE MIT

avoid a deadlock between cm_freelanceLock and cm_scacheLock

diff --git a/src/WINNT/afsd/cm_scache.c b/src/WINNT/afsd/cm_scache.c
index 86598e1fb20ee4c5ba1d1b3316dab61d63fdc75e..5b7b521b52b29d177e64f30221baf91b51b18233 100644 (file)
--- a/src/WINNT/afsd/cm_scache.c
+++ b/src/WINNT/afsd/cm_scache.c
@@ -704,13 +704,12 @@ long cm_GetSCache(cm_fid_t *fidp, cm_scache_t **outScpp, cm_user_t *userp,
         char mp[MOUNTPOINTLEN] = "";
         afs_uint32 fileType;
 
+        lock_ReleaseWrite(&cm_scacheLock);
         osi_Log0(afsd_logp,"cm_GetSCache Freelance and special");
 
         if (cm_getLocalMountPointChange()) {   // check for changes
             cm_clearLocalMountPointChange();    // clear the changefile
-                   lock_ReleaseWrite(&cm_scacheLock);
             cm_reInitLocalMountPoints();       // start reinit
-                       lock_ObtainWrite(&cm_scacheLock);
         }
 
         lock_ObtainMutex(&cm_Freelance_Lock);
@@ -726,7 +725,7 @@ long cm_GetSCache(cm_fid_t *fidp, cm_scache_t **outScpp, cm_user_t *userp,
 
         }
         lock_ReleaseMutex(&cm_Freelance_Lock);
-
+        lock_ObtainWrite(&cm_scacheLock);
         if (scp == NULL)
             scp = cm_GetNewSCache();
        if (scp == NULL) {