windows-lock-corrections-20080808

[openafs.git] / src / WINNT / afsd / cm_daemon.c

diff --git a/src/WINNT/afsd/cm_daemon.c b/src/WINNT/afsd/cm_daemon.c
index a49c289..b930a94 100644 (file)
--- a/src/WINNT/afsd/cm_daemon.c
+++ b/src/WINNT/afsd/cm_daemon.c
@@ -132,22 +132,14 @@ void cm_BkgDaemon(void * parm)
 #ifdef DEBUG_REFCOUNT                
        osi_Log2(afsd_logp,"cm_BkgDaemon (after) scp 0x%x ref %d",rp->scp, rp->scp->refCount);
 #endif
-       if (code == 0) {
-           cm_ReleaseUser(rp->userp);
-           cm_ReleaseSCache(rp->scp);
-           free(rp);
-       }
-
-        lock_ObtainWrite(&cm_daemonLock);
 
         /* 
-        * Keep the following list synchronized with the
-        * error code list in cm_BkgStore
-        */
+         * Keep the following list synchronized with the
+         * error code list in cm_BkgStore.  
+         * cm_SyncOpDone(CM_SCACHESYNC_ASYNCSTORE) will be called there unless
+         * one of these errors has occurred.
+         */
        switch ( code ) {
-       case 0: /* success */
-           osi_Log1(afsd_logp,"cm_BkgDaemon SUCCESS: request 0x%p", rp);
-           break;
        case CM_ERROR_TIMEDOUT: /* or server restarting */
        case CM_ERROR_RETRY:
        case CM_ERROR_WOULDBLOCK:
@@ -157,18 +149,26 @@ void cm_BkgDaemon(void * parm)
        case CM_ERROR_PARTIALWRITE:
            osi_Log2(afsd_logp,"cm_BkgDaemon re-queueing failed request 0x%p code 0x%x",
                     rp, code);
+            lock_ObtainWrite(&cm_daemonLock);
            cm_bkgQueueCount++;
            osi_QAddT((osi_queue_t **) &cm_bkgListp, (osi_queue_t **)&cm_bkgListEndp, &rp->q);
            break;
-       default:
-           osi_Log2(afsd_logp,"cm_BkgDaemon FAILED: request dropped 0x%p code 0x%x",
+       case 0:  /* success */
+       default: /* other error */
+           if (code == 0)
+                osi_Log1(afsd_logp,"cm_BkgDaemon SUCCESS: request 0x%p", rp);
+            else
+                osi_Log2(afsd_logp,"cm_BkgDaemon FAILED: request dropped 0x%p code 0x%x",
                     rp, code);
+           cm_ReleaseUser(rp->userp);
+           cm_ReleaseSCache(rp->scp);
+           free(rp);
+            lock_ObtainWrite(&cm_daemonLock);
        }
     }
     lock_ReleaseWrite(&cm_daemonLock);
 
     thrd_SetEvent(cm_BkgDaemon_ShutdownEvent[daemonID]);
-
 }
 
 void cm_QueueBKGRequest(cm_scache_t *scp, cm_bkgProc_t *procp, afs_uint32 p1, afs_uint32 p2, afs_uint32 p3, afs_uint32 p4,