AFSDirectoryCB *pCurrentDirEntry = NULL, *pNextDirEntry = NULL;
BOOLEAN bReleaseVolumeLock = FALSE;
AFSVolumeCB *pVolumeCB = NULL, *pNextVolume = NULL;
+ AFSFcb *pFcb = NULL;
+ LONG lFileType;
LARGE_INTEGER liCurrentTime;
BOOLEAN bVolumeObject = FALSE;
LONG lCount;
AFSReleaseResource( pVolumeCB->ObjectInfoTree.TreeLock);
+ //
+ // Dropping the TreeLock permits the
+ // pCurrentObject->ObjectReferenceCount to change
+ //
+
if( AFSAcquireExcl( pVolumeCB->ObjectInfoTree.TreeLock,
FALSE))
{
- if( pCurrentObject->Fcb != NULL)
+ if ( pCurrentObject->ObjectReferenceCount == 0)
{
- //
- // Acquire and drop the Fcb resource to synchronize
- // with a potentially active AFSCleanup() which sets
- // the OpenReferenceCount to zero while holding the
- // resource.
- //
+ if( pCurrentObject->Fcb != NULL)
+ {
- AFSAcquireExcl( &pCurrentObject->Fcb->NPFcb->Resource,
- TRUE);
+ AFSRemoveFcb( &pCurrentObject->Fcb);
+ }
- AFSReleaseResource( &pCurrentObject->Fcb->NPFcb->Resource);
+ if( pCurrentObject->Specific.Directory.PIOCtlDirectoryCB != NULL)
+ {
- AFSRemoveFcb( &pCurrentObject->Fcb);
- }
+ if( pCurrentObject->Specific.Directory.PIOCtlDirectoryCB->ObjectInformation->Fcb != NULL)
+ {
- if( pCurrentObject->Specific.Directory.PIOCtlDirectoryCB != NULL)
- {
+ AFSRemoveFcb( &pCurrentObject->Specific.Directory.PIOCtlDirectoryCB->ObjectInformation->Fcb);
+ }
- if( pCurrentObject->Specific.Directory.PIOCtlDirectoryCB->ObjectInformation->Fcb != NULL)
- {
+ AFSDeleteObjectInfo( pCurrentObject->Specific.Directory.PIOCtlDirectoryCB->ObjectInformation);
- AFSRemoveFcb( &pCurrentObject->Specific.Directory.PIOCtlDirectoryCB->ObjectInformation->Fcb);
- }
+ ExDeleteResourceLite( &pCurrentChildObject->Specific.Directory.PIOCtlDirectoryCB->NonPaged->Lock);
- AFSDeleteObjectInfo( pCurrentObject->Specific.Directory.PIOCtlDirectoryCB->ObjectInformation);
+ AFSExFreePool( pCurrentChildObject->Specific.Directory.PIOCtlDirectoryCB->NonPaged);
- ExDeleteResourceLite( &pCurrentChildObject->Specific.Directory.PIOCtlDirectoryCB->NonPaged->Lock);
+ AFSExFreePool( pCurrentObject->Specific.Directory.PIOCtlDirectoryCB);
+ }
- AFSExFreePool( pCurrentChildObject->Specific.Directory.PIOCtlDirectoryCB->NonPaged);
+ AFSDbgLogMsg( AFS_SUBSYSTEM_CLEANUP_PROCESSING,
+ AFS_TRACE_LEVEL_VERBOSE,
+ "AFSPrimaryVolumeWorkerThread Deleting deleted object %08lX\n",
+ pCurrentObject);
- AFSExFreePool( pCurrentObject->Specific.Directory.PIOCtlDirectoryCB);
+ AFSDeleteObjectInfo( pCurrentObject);
}
- AFSDbgLogMsg( AFS_SUBSYSTEM_CLEANUP_PROCESSING,
- AFS_TRACE_LEVEL_VERBOSE,
- "AFSPrimaryWorker Deleting deleted object %08lX\n",
- pCurrentObject);
-
- AFSDeleteObjectInfo( pCurrentObject);
-
AFSConvertToShared( pVolumeCB->ObjectInfoTree.TreeLock);
pCurrentObject = pNextObject;
pCurrentChildObject = pCurrentDirEntry->ObjectInformation;
+ pFcb = NULL;
+
AFSDbgLogMsg( AFS_SUBSYSTEM_CLEANUP_PROCESSING,
AFS_TRACE_LEVEL_VERBOSE,
- "AFSPrimaryWorker Deleting DE %wZ Object %08lX\n",
+ "AFSPrimaryVolumeWorkerThread Deleting DE %wZ Object %08lX\n",
&pCurrentDirEntry->NameInformation.FileName,
pCurrentChildObject);
if( pCurrentChildObject->Fcb != NULL)
{
- if( pCurrentChildObject->FileType == AFS_FILE_TYPE_FILE)
- {
-
- AFSCleanupFcb( pCurrentChildObject->Fcb,
- TRUE);
- }
-
- //
- // Acquire and drop the Fcb resource to synchronize
- // with a potentially active AFSCleanup() which sets
- // the OpenReferenceCount to zero while holding the
- // resource.
- //
-
- AFSAcquireExcl( &pCurrentChildObject->Fcb->NPFcb->Resource,
- TRUE);
+ pFcb = (AFSFcb *) InterlockedCompareExchangePointer( (PVOID *)&pCurrentChildObject->Fcb, NULL, (PVOID)pCurrentChildObject->Fcb);
- AFSReleaseResource( &pCurrentChildObject->Fcb->NPFcb->Resource);
-
- AFSRemoveFcb( &pCurrentChildObject->Fcb);
+ lFileType = pCurrentChildObject->FileType;
}
if( pCurrentChildObject->FileType == AFS_FILE_TYPE_DIRECTORY &&
AFSDbgLogMsg( AFS_SUBSYSTEM_CLEANUP_PROCESSING,
AFS_TRACE_LEVEL_VERBOSE,
- "AFSPrimaryWorker Deleting object %08lX\n",
+ "AFSPrimaryVolumeWorkerThread Deleting object %08lX\n",
pCurrentChildObject);
AFSDeleteObjectInfo( pCurrentChildObject);
}
pCurrentDirEntry = pNextDirEntry;
+
+ if ( pFcb != NULL)
+ {
+
+ if( lFileType == AFS_FILE_TYPE_FILE)
+ {
+ //
+ // We must not hold pVolumeCB->ObjectInfoTree.TreeLock exclusive
+ // across an AFSCleanupFcb call since it can deadlock with an
+ // invalidation call from the service.
+ //
+
+ AFSReleaseResource( pVolumeCB->ObjectInfoTree.TreeLock);
+
+ //
+ // Dropping the TreeLock permits the
+ // pCurrentObject->ObjectReferenceCount to change
+ //
+
+ AFSCleanupFcb( pFcb,
+ TRUE);
+
+ AFSAcquireExcl( pVolumeCB->ObjectInfoTree.TreeLock,
+ TRUE);
+ }
+
+ AFSRemoveFcb( &pFcb);
+ }
}
pCurrentObject->Specific.Directory.DirectoryNodeListHead = NULL;
AFSDbgLogMsg( AFS_SUBSYSTEM_DIR_NODE_COUNT,
AFS_TRACE_LEVEL_VERBOSE,
- "AFSPrimaryWorker Reset count to 0 on parent FID %08lX-%08lX-%08lX-%08lX\n",
+ "AFSPrimaryVolumeWorkerThread Reset count to 0 on parent FID %08lX-%08lX-%08lX-%08lX\n",
pCurrentObject->FileId.Cell,
pCurrentObject->FileId.Volume,
pCurrentObject->FileId.Vnode,
pCurrentObject->FileId.Unique);
-
//
// Clear our enumerated flag on this object so we retrieve info again on next access
//
ClearFlag( pCurrentObject->Flags, AFS_OBJECT_FLAGS_DIRECTORY_ENUMERATED);
AFSReleaseResource( pCurrentObject->Specific.Directory.DirectoryNodeHdr.TreeLock);
+
+ AFSConvertToShared( pVolumeCB->ObjectInfoTree.TreeLock);
}
else
{
break;
}
-
- AFSConvertToShared( pVolumeCB->ObjectInfoTree.TreeLock);
}
else
{
pCurrentObject->Fcb->OpenReferenceCount == 0))
{
- AFSReleaseResource( pVolumeCB->ObjectInfoTree.TreeLock);
+ pFcb = (AFSFcb *) InterlockedCompareExchangePointer( (PVOID *)&pCurrentObject->Fcb, NULL, (PVOID)pCurrentObject->Fcb);
- if( AFSAcquireExcl( pVolumeCB->ObjectInfoTree.TreeLock,
- FALSE))
+ if( pFcb != NULL)
{
- if( pCurrentObject->Fcb != NULL)
- {
+ AFSReleaseResource( pVolumeCB->ObjectInfoTree.TreeLock);
+
+ //
+ // Dropping the TreeLock permits the
+ // pCurrentObject->ObjectReferenceCount to change
+ //
- AFSCleanupFcb( pCurrentObject->Fcb,
- TRUE);
+ AFSCleanupFcb( pFcb,
+ TRUE);
- //
- // Acquire and drop the Fcb resource to synchronize
- // with a potentially active AFSCleanup() which sets
- // the OpenReferenceCount to zero while holding the
- // resource.
- //
+ AFSAcquireExcl( pVolumeCB->ObjectInfoTree.TreeLock,
+ TRUE);
- AFSAcquireExcl( &pCurrentObject->Fcb->NPFcb->Resource,
- TRUE);
+ AFSRemoveFcb( &pFcb);
+ }
- AFSReleaseResource( &pCurrentObject->Fcb->NPFcb->Resource);
+ AFSReleaseResource( pVolumeCB->ObjectInfoTree.TreeLock);
- AFSRemoveFcb( &pCurrentObject->Fcb);
- }
+ if( AFSAcquireExcl( pVolumeCB->ObjectInfoTree.TreeLock,
+ FALSE))
+ {
AFSDeleteObjectInfo( pCurrentObject);
AFSReleaseResource( pVolumeCB->ObjectInfoTree.TreeLock);
- if( AFSAcquireExcl( pVolumeCB->ObjectInfoTree.TreeLock,
- FALSE))
- {
-
- AFSCleanupFcb( pCurrentObject->Fcb,
- FALSE);
-
- AFSConvertToShared( pVolumeCB->ObjectInfoTree.TreeLock);
-
- pCurrentObject = pNextObject;
-
- continue;
- }
- else
- {
+ //
+ // Dropping the TreeLock permits the
+ // pCurrentObject->ObjectReferenceCount to change
+ //
- bReleaseVolumeLock = FALSE;
+ AFSCleanupFcb( pCurrentObject->Fcb,
+ FALSE);
- break;
- }
+ AFSAcquireShared( pVolumeCB->ObjectInfoTree.TreeLock,
+ TRUE);
}
}