From 22d7c8461b16940c3606d63a0b7e232563871cd8 Mon Sep 17 00:00:00 2001 From: Rod Widdowson Date: Sun, 25 Aug 2013 13:20:28 -0700 Subject: [PATCH] Windows: Strip out unused ModWriter Fastio code The code is no longer used (the fcb->PagingIO resource is taken for us by the modwriter) so we strip it out to save other making changes and then remembering/discovering that this code isn't being used. Change-Id: I0d880049758559ae0860f8c1e12583304a459a68 Reviewed-on: http://gerrit.openafs.org/10191 Tested-by: BuildBot Reviewed-by: Jeffrey Altman --- .../afsrdr/kernel/fs/AFSFastIoSupport.cpp | 55 ------------------- src/WINNT/afsrdr/kernel/fs/AFSInit.cpp | 2 - .../afsrdr/kernel/fs/Include/AFSCommon.h | 11 ---- 3 files changed, 68 deletions(-) diff --git a/src/WINNT/afsrdr/kernel/fs/AFSFastIoSupport.cpp b/src/WINNT/afsrdr/kernel/fs/AFSFastIoSupport.cpp index 8f9ccac81..846ef6216 100644 --- a/src/WINNT/afsrdr/kernel/fs/AFSFastIoSupport.cpp +++ b/src/WINNT/afsrdr/kernel/fs/AFSFastIoSupport.cpp @@ -441,61 +441,6 @@ AFSFastIoMdlWriteComplete( IN struct _FILE_OBJECT *FileObject, return bStatus; } -NTSTATUS -AFSFastIoAcquireForModWrite( IN struct _FILE_OBJECT *FileObject, - IN PLARGE_INTEGER EndingOffset, - OUT struct _ERESOURCE **ResourceToRelease, - IN struct _DEVICE_OBJECT *DeviceObject) -{ - UNREFERENCED_PARAMETER(DeviceObject); - UNREFERENCED_PARAMETER(EndingOffset); - - NTSTATUS ntStatus = STATUS_FILE_LOCK_CONFLICT; - AFSFcb *pFcb = (AFSFcb *)FileObject->FsContext; - - __Enter - { - - if( AFSAcquireExcl( &pFcb->NPFcb->Resource, - BooleanFlagOn( FileObject->Flags, FO_SYNCHRONOUS_IO))) - { - - AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, - AFS_TRACE_LEVEL_VERBOSE, - "AFSFastIoAcquireForModWrite Acquired Fcb SectionObject lock %p EXCL %08lX\n", - &pFcb->NPFcb->SectionObjectResource, - PsGetCurrentThread())); - - ntStatus = STATUS_SUCCESS; - - *ResourceToRelease = &pFcb->NPFcb->SectionObjectResource; - } - } - - return ntStatus; -} - -NTSTATUS -AFSFastIoReleaseForModWrite( IN struct _FILE_OBJECT *FileObject, - IN struct _ERESOURCE *ResourceToRelease, - IN struct _DEVICE_OBJECT *DeviceObject) -{ - UNREFERENCED_PARAMETER(FileObject); - UNREFERENCED_PARAMETER(DeviceObject); - - NTSTATUS ntStatus = STATUS_SUCCESS; - - AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, - AFS_TRACE_LEVEL_VERBOSE, - "AFSFastIoReleaseForModWrite Releasing lock %p EXCL %08lX\n", - ResourceToRelease, - PsGetCurrentThread())); - - AFSReleaseResource( ResourceToRelease); - - return ntStatus; -} - NTSTATUS AFSFastIoAcquireForCCFlush( IN struct _FILE_OBJECT *FileObject, IN struct _DEVICE_OBJECT *DeviceObject) diff --git a/src/WINNT/afsrdr/kernel/fs/AFSInit.cpp b/src/WINNT/afsrdr/kernel/fs/AFSInit.cpp index 25e11b086..a2631f319 100644 --- a/src/WINNT/afsrdr/kernel/fs/AFSInit.cpp +++ b/src/WINNT/afsrdr/kernel/fs/AFSInit.cpp @@ -393,8 +393,6 @@ DriverEntry( PDRIVER_OBJECT DriverObject, AFSFastIoDispatch.AcquireFileForNtCreateSection = AFSFastIoAcquireFile; AFSFastIoDispatch.ReleaseFileForNtCreateSection = AFSFastIoReleaseFile; AFSFastIoDispatch.FastIoDetachDevice = AFSFastIoDetachDevice; - //AFSFastIoDispatch.AcquireForModWrite = AFSFastIoAcquireForModWrite; - //AFSFastIoDispatch.ReleaseForModWrite = AFSFastIoReleaseForModWrite; AFSFastIoDispatch.MdlRead = AFSFastIoMdlRead; AFSFastIoDispatch.MdlReadComplete = AFSFastIoMdlReadComplete; AFSFastIoDispatch.PrepareMdlWrite = AFSFastIoPrepareMdlWrite; diff --git a/src/WINNT/afsrdr/kernel/fs/Include/AFSCommon.h b/src/WINNT/afsrdr/kernel/fs/Include/AFSCommon.h index 55ab75652..e1bc47b78 100644 --- a/src/WINNT/afsrdr/kernel/fs/Include/AFSCommon.h +++ b/src/WINNT/afsrdr/kernel/fs/Include/AFSCommon.h @@ -658,17 +658,6 @@ AFSFastIoMdlWriteComplete( IN struct _FILE_OBJECT *FileObject, IN PMDL MdlChain, IN struct _DEVICE_OBJECT *DeviceObject); -NTSTATUS -AFSFastIoAcquireForModWrite( IN struct _FILE_OBJECT *FileObject, - IN PLARGE_INTEGER EndingOffset, - OUT struct _ERESOURCE **ResourceToRelease, - IN struct _DEVICE_OBJECT *DeviceObject); - -NTSTATUS -AFSFastIoReleaseForModWrite( IN struct _FILE_OBJECT *FileObject, - IN struct _ERESOURCE *ResourceToRelease, - IN struct _DEVICE_OBJECT *DeviceObject); - NTSTATUS AFSFastIoAcquireForCCFlush( IN struct _FILE_OBJECT *FileObject, IN struct _DEVICE_OBJECT *DeviceObject); -- 2.39.5