jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-31 13:38:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DEVEL15-windows-volstat-20080207

Browse Source 
LICENSE MIT

When updating the volume status do not introduce a deadlock by holding
cm_serverLock


(cherry picked from commit 1a95df210c51a4e1416e5996b99c5640e4265255)
This commit is contained in:
Jeffrey Altman 2008-02-07 14:48:53 +00:00
parent 0cd87a3335
commit b769970e17
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/WINNT/afsd/cm_conn.c
View File

@ -278,9 +278,6 @@ cm_Analyze(cm_conn_t *connp, cm_user_t *userp, cm_req_t *reqp,
* background daemon thread as they become available
*/
if (timeLeft > 7 && fidp) {
cm_volume_t *volp;
cm_vol_state_t *statep;
thrd_Sleep(5000);
code = cm_GetVolumeByID(cellp, fidp->volume, userp, reqp,
@ -393,20 +390,18 @@ cm_Analyze(cm_conn_t *connp, cm_user_t *userp, cm_req_t *reqp,
statep = &volp->ro;
else if (fidp->volume == volp->bk.ID)
statep = &volp->bk;
cm_UpdateVolumeStatus(volp, statep->ID);
}
cm_PutVolume(volp);
}
break;
}
}
lock_ReleaseWrite(&cm_serverLock);
if (statep)
if (statep) {
cm_UpdateVolumeStatus(volp, statep->ID);
cm_PutVolume(volp);
}
if (free_svr_list) {
cm_FreeServerList(&serversp, 0);
*serverspp = serversp;
@ -482,13 +477,12 @@ cm_Analyze(cm_conn_t *connp, cm_user_t *userp, cm_req_t *reqp,
free_svr_list = 1;
}
}
lock_ObtainWrite(&cm_serverLock);
for (tsrp = serversp; tsrp; tsrp=tsrp->next) {
if (tsrp->server == serverp) {
/* REDIRECT */
if (errorCode == VMOVED) {
tsrp->status = srv_deleted;
if (fidp)
cm_ForceUpdateVolume(fidp, userp, reqp);
} else {
tsrp->status = srv_offline;
}
@ -504,13 +498,20 @@ cm_Analyze(cm_conn_t *connp, cm_user_t *userp, cm_req_t *reqp,
statep = &volp->ro;
else if (fidp->volume == volp->bk.ID)
statep = &volp->bk;
cm_UpdateVolumeStatus(volp, statep->ID);
}
cm_PutVolume(volp);
}
}
}
lock_ReleaseWrite(&cm_serverLock);
if (fidp && errorCode == VMOVED)
cm_ForceUpdateVolume(fidp, userp, reqp);
if (statep) {
cm_UpdateVolumeStatus(volp, statep->ID);
cm_PutVolume(volp);
}
if (free_svr_list) {
cm_FreeServerList(&serversp, 0);
*serverspp = serversp;