From 34f4427a978a485d83b1faa57fd786e47b8dddf5 Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Sat, 26 Jan 2013 23:19:05 -0500 Subject: [PATCH] Windows: Move VolumeWorkerContext to NonPaged pool The VolumeWorkerContext contains a KEVENT which must be allocated from the NonPaged pool. Move it to the AFSNonPagedVolumeCB struct. Change-Id: If24ea5f22e6cc7e71328d0d2d8e0c8b9209ce5b2 Reviewed-on: http://gerrit.openafs.org/8992 Tested-by: BuildBot Reviewed-by: Jeffrey Altman Tested-by: Jeffrey Altman --- src/WINNT/afsrdr/kernel/lib/AFSWorker.cpp | 6 +++--- src/WINNT/afsrdr/kernel/lib/Include/AFSStructs.h | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/WINNT/afsrdr/kernel/lib/AFSWorker.cpp b/src/WINNT/afsrdr/kernel/lib/AFSWorker.cpp index 58f5488ab..f9b101934 100644 --- a/src/WINNT/afsrdr/kernel/lib/AFSWorker.cpp +++ b/src/WINNT/afsrdr/kernel/lib/AFSWorker.cpp @@ -380,7 +380,7 @@ AFSInitVolumeWorker( IN AFSVolumeCB *VolumeCB) { NTSTATUS ntStatus = STATUS_SUCCESS; - AFSWorkQueueContext *pWorker = &VolumeCB->VolumeWorkerContext; + AFSWorkQueueContext *pWorker = &VolumeCB->NonPagedVcb->VolumeWorkerContext; HANDLE hThread; AFSDeviceExt *pControlDeviceExt = (AFSDeviceExt *)AFSControlDeviceObject->DeviceExtension; PKSTART_ROUTINE pStartRoutine = NULL; @@ -527,7 +527,7 @@ AFSShutdownVolumeWorker( IN AFSVolumeCB *VolumeCB) { NTSTATUS ntStatus = STATUS_SUCCESS; - AFSWorkQueueContext *pWorker = &VolumeCB->VolumeWorkerContext; + AFSWorkQueueContext *pWorker = &VolumeCB->NonPagedVcb->VolumeWorkerContext; // // Clear the 'keep processing' flag @@ -955,7 +955,7 @@ AFSPrimaryVolumeWorkerThread( IN PVOID Context) UNREFERENCED_PARAMETER(Context); NTSTATUS ntStatus = STATUS_SUCCESS; - AFSWorkQueueContext *pPoolContext = (AFSWorkQueueContext *)&AFSGlobalRoot->VolumeWorkerContext; + AFSWorkQueueContext *pPoolContext = (AFSWorkQueueContext *)&AFSGlobalRoot->NonPagedVcb->VolumeWorkerContext; AFSDeviceExt *pControlDeviceExt = NULL; AFSDeviceExt *pRDRDeviceExt = NULL; LARGE_INTEGER DueTime; diff --git a/src/WINNT/afsrdr/kernel/lib/Include/AFSStructs.h b/src/WINNT/afsrdr/kernel/lib/Include/AFSStructs.h index 6c75701a7..e4d47a9b1 100644 --- a/src/WINNT/afsrdr/kernel/lib/Include/AFSStructs.h +++ b/src/WINNT/afsrdr/kernel/lib/Include/AFSStructs.h @@ -323,7 +323,13 @@ typedef struct _AFS_NON_PAGED_VOLUME_CB ERESOURCE DirectoryNodeHdrLock; -}AFSNonPagedVolumeCB; + // + // Volume worker thread + // + + AFSWorkQueueContext VolumeWorkerContext; + +} AFSNonPagedVolumeCB; typedef struct _AFS_VOLUME_CB { @@ -380,12 +386,6 @@ typedef struct _AFS_VOLUME_CB AFSFcb *RootFcb; - // - // Volume worker thread - // - - AFSWorkQueueContext VolumeWorkerContext; - // // Volume information // -- 2.39.5