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

Windows: out of order locks cm_CheckCBExpiration

Browse Source 
The recent refactoring of cm_CheckCBExpiration introduced
a lock ordering error between the cm_scache_t rw lock and the
cm_scacheLock.  This patchset fixes the error by dropping the
cm_scacheLock as each cm_scache_t is being processed.

Change-Id: Ib9e45abc5a43ca550d4a2a7923e3b30017e9fbf9
Reviewed-on: http://gerrit.openafs.org/3773
Tested-by: Jeffrey Altman <jaltman@openafs.org>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
This commit is contained in:
Jeffrey Altman 2011-01-29 23:24:16 -05:00 committed by Jeffrey Altman
parent d8a2291c06
commit 67195401c9
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/WINNT/afsd/cm_callback.c
View File

@ -1930,7 +1930,7 @@ void cm_CheckCBExpiration(void)
{
afs_uint32 i;
cm_scache_t *scp;
cm_volume_t *volp = NULL;
cm_volume_t *volp;
enum volstatus volstate;
time_t now, downTime;
@ -1940,10 +1940,9 @@ void cm_CheckCBExpiration(void)
lock_ObtainWrite(&cm_scacheLock);
for (i=0; i<cm_data.scacheHashTableSize; i++) {
for (scp = cm_data.scacheHashTablep[i]; scp; scp=scp->nextp) {
if (volp) {
cm_PutVolume(volp);
volp = NULL;
}
volp = NULL;
cm_HoldSCacheNoLock(scp);
lock_ReleaseWrite(&cm_scacheLock);
/*
* If this is not a PURERO object and there is no callback
@ -1951,7 +1950,7 @@ void cm_CheckCBExpiration(void)
*/
if (!(scp->flags & CM_SCACHEFLAG_PURERO) &&
(scp->cbServerp == NULL || scp->cbExpires == 0 || now < scp->cbExpires))
continue;
goto scp_complete;
/*
* Determine the volume state and update the callback info
@ -1979,23 +1978,20 @@ void cm_CheckCBExpiration(void)
/* If there is no callback or it hasn't expired, there is nothing to do */
if (scp->cbServerp == NULL || scp->cbExpires == 0 || now < scp->cbExpires)
continue;
goto scp_complete;
/* If the volume is known not to be online, do not expire the callback */
if (volstate != vl_online)
continue;
goto scp_complete;
/*
* If all the servers are down and the callback expired after the
* issuing server went down, do not expire the callback
*/
if (cm_CBServersDownTime(scp, volp, &downTime) && downTime && downTime < scp->cbExpires)
continue;
goto scp_complete;
/* The callback has expired, discard the status info */
cm_HoldSCacheNoLock(scp);
lock_ReleaseWrite(&cm_scacheLock);
osi_Log4(afsd_logp, "Callback Expiration Discarding SCache scp 0x%p vol %u vn %u uniq %u",
scp, scp->fid.volume, scp->fid.vnode, scp->fid.unique);
lock_ObtainWrite(&scp->rw);
@ -2004,14 +2000,14 @@ void cm_CheckCBExpiration(void)
cm_CallbackNotifyChange(scp);
scp_complete:
if (volp)
cm_PutVolume(volp);
lock_ObtainWrite(&cm_scacheLock);
cm_ReleaseSCacheNoLock(scp);
}
}
if (volp) {
cm_PutVolume(volp);
volp = NULL;
}
lock_ReleaseWrite(&cm_scacheLock);
osi_Log0(afsd_logp, "CheckCBExpiration Complete");