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 <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>

diff --git a/src/WINNT/afsrdr/kernel/fs/AFSFastIoSupport.cpp b/src/WINNT/afsrdr/kernel/fs/AFSFastIoSupport.cpp
index 8f9ccac81f76951bdd0907d0e046d041106b6874..846ef62163ec4106633ae4ef090da55619b6c6fd 100644 (file)
--- 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 25e11b0864ac4218a074aa2cf308ce7387d78d70..a2631f31953ed15d047b9f5bdd8079067bc97e6e 100644 (file)
--- 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 55ab756525c14791512cd06faa2838a6b8168d47..e1bc47b78103469d25b0a9404507c4ea837f33d6 100644 (file)
--- 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);