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

callback-deadlock-20040819

Browse Source 
cm_CallbackNotifyChange(scp); must not be called with scp locked
This commit is contained in:
Jeffrey Altman 2004-08-19 20:50:03 +00:00 committed by Jeffrey Altman
parent f2b18e7af8
commit 7c01e67317
2 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/WINNT/afsd/NTMakefile
View File

@ -221,7 +221,9 @@ LOGON_DLLLIBS =\
$(AFSKFWLIB)
LOGON_DLLSDKLIBS =\
dnsapi.lib mpr.lib \
dnsapi.lib \
netapi32.lib \
mpr.lib \
advapi32.lib \
secur32.lib \
strsafe.lib \

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

@ -90,33 +90,34 @@ void cm_RecordRacingRevoke(cm_fid_t *fidp, long cancelFlags)
/*
* When we lose a callback, may have to send change notification replies.
* Do not call with a lock on the scp.
*/
void cm_CallbackNotifyChange(cm_scache_t *scp)
{
osi_Log2(afsd_logp, "CallbackNotifyChange FileType %d Flags %lX",
scp->fileType, scp->flags);
if (scp->fileType == CM_SCACHETYPE_DIRECTORY) {
if (scp->flags & CM_SCACHEFLAG_ANYWATCH)
smb_NotifyChange(0,
FILE_NOTIFY_GENERIC_DIRECTORY_FILTER,
scp, NULL, NULL, TRUE);
} else {
cm_fid_t tfid;
cm_scache_t *dscp;
if (scp->fileType == CM_SCACHETYPE_DIRECTORY) {
if (scp->flags & CM_SCACHEFLAG_ANYWATCH)
smb_NotifyChange(0,
FILE_NOTIFY_GENERIC_DIRECTORY_FILTER,
scp, NULL, NULL, TRUE);
} else {
cm_fid_t tfid;
cm_scache_t *dscp;
tfid.cell = scp->fid.cell;
tfid.volume = scp->fid.volume;
tfid.vnode = scp->parentVnode;
tfid.unique = scp->parentUnique;
dscp = cm_FindSCache(&tfid);
if (dscp &&
dscp->flags & CM_SCACHEFLAG_ANYWATCH)
smb_NotifyChange(0,
FILE_NOTIFY_GENERIC_FILE_FILTER,
dscp, NULL, NULL, TRUE);
if (dscp) cm_ReleaseSCache(dscp);
}
tfid.cell = scp->fid.cell;
tfid.volume = scp->fid.volume;
tfid.vnode = scp->parentVnode;
tfid.unique = scp->parentUnique;
dscp = cm_FindSCache(&tfid);
if (dscp &&
dscp->flags & CM_SCACHEFLAG_ANYWATCH)
smb_NotifyChange( 0,
FILE_NOTIFY_GENERIC_FILE_FILTER,
dscp, NULL, NULL, TRUE);
if (dscp) cm_ReleaseSCache(dscp);
}
}
/* called with no locks held for every file ID that is revoked directly by
@ -906,13 +907,13 @@ void cm_CheckCBExpiration(void)
for(scp = cm_hashTablep[i]; scp; scp=scp->nextp) {
scp->refCount++;
lock_ReleaseWrite(&cm_scacheLock);
lock_ObtainMutex(&scp->mx);
if (scp->cbExpires > 0 && (scp->cbServerp == NULL || now > scp->cbExpires)) {
osi_Log1(afsd_logp, "Callback Expiration Discarding SCache scp %x", scp);
cm_CallbackNotifyChange(scp);
lock_ObtainMutex(&scp->mx);
cm_DiscardSCache(scp);
lock_ReleaseMutex(&scp->mx);
}
lock_ReleaseMutex(&scp->mx);
lock_ObtainWrite(&cm_scacheLock);
osi_assert(scp->refCount-- > 0);
}