[CDFS]

Remove redundant code now we have IRP context dispatch

svn path=/trunk/; revision=68231

diff --git a/reactos/drivers/filesystems/cdfs/devctrl.c b/reactos/drivers/filesystems/cdfs/devctrl.c
index f2db3c3..7e2221a 100644 (file)
--- a/reactos/drivers/filesystems/cdfs/devctrl.c
+++ b/reactos/drivers/filesystems/cdfs/devctrl.c
@@ -39,14 +39,12 @@ CdfsDeviceControl(
     if (!FileObject)
     {
         DPRINT1("FIXME: CdfsDeviceControl called without FileObject!\n");
     if (!FileObject)
     {
         DPRINT1("FIXME: CdfsDeviceControl called without FileObject!\n");

-        Irp->IoStatus.Status = STATUS_INVALID_DEVICE_REQUEST;

         return STATUS_INVALID_DEVICE_REQUEST;
     }
 
     /* Only support such operations on volume */
     if (!(FileObject->RelatedFileObject == NULL || FileObject->RelatedFileObject->FsContext2 != NULL))
     {
         return STATUS_INVALID_DEVICE_REQUEST;
     }
 
     /* Only support such operations on volume */
     if (!(FileObject->RelatedFileObject == NULL || FileObject->RelatedFileObject->FsContext2 != NULL))
     {

-        Irp->IoStatus.Status = STATUS_INVALID_PARAMETER;

         return STATUS_INVALID_PARAMETER;
     }
 
         return STATUS_INVALID_PARAMETER;
     }
 


@@ -54,7 +52,6 @@ CdfsDeviceControl(
     {
         /* We should handle this one, but we don't! */
         Status = STATUS_NOT_IMPLEMENTED;
     {
         /* We should handle this one, but we don't! */
         Status = STATUS_NOT_IMPLEMENTED;

-        Irp->IoStatus.Status = Status;

     }
     else
     {
     }
     else
     {

diff --git a/reactos/drivers/filesystems/cdfs/dirctl.c b/reactos/drivers/filesystems/cdfs/dirctl.c
index eade96d..92594b8 100644 (file)
--- a/reactos/drivers/filesystems/cdfs/dirctl.c
+++ b/reactos/drivers/filesystems/cdfs/dirctl.c
@@ -802,8 +802,6 @@ CdfsDirectoryControl(
     Irp = IrpContext->Irp;
     DeviceObject = IrpContext->DeviceObject;
 
     Irp = IrpContext->Irp;
     DeviceObject = IrpContext->DeviceObject;
 

-    FsRtlEnterFileSystem();
-

     switch (IrpContext->MinorFunction)
     {
     case IRP_MN_QUERY_DIRECTORY:
     switch (IrpContext->MinorFunction)
     {
     case IRP_MN_QUERY_DIRECTORY:


@@ -824,10 +822,8 @@ CdfsDirectoryControl(
 
     if (Status != STATUS_PENDING)
     {
 
     if (Status != STATUS_PENDING)
     {

-        Irp->IoStatus.Status = Status;

         Irp->IoStatus.Information = 0;
     }
         Irp->IoStatus.Information = 0;
     }

-    FsRtlExitFileSystem();

 
     return(Status);
 }
 
     return(Status);
 }

diff --git a/reactos/drivers/filesystems/cdfs/finfo.c b/reactos/drivers/filesystems/cdfs/finfo.c
index ecb82bb..e0e08e1 100644 (file)
--- a/reactos/drivers/filesystems/cdfs/finfo.c
+++ b/reactos/drivers/filesystems/cdfs/finfo.c
@@ -420,7 +420,6 @@ CdfsQueryInformation(
         break;
     }
 
         break;
     }
 

-    Irp->IoStatus.Status = Status;

     if (NT_SUCCESS(Status) || Status == STATUS_BUFFER_OVERFLOW)
         Irp->IoStatus.Information =
         Stack->Parameters.QueryFile.Length - BufferLength;
     if (NT_SUCCESS(Status) || Status == STATUS_BUFFER_OVERFLOW)
         Irp->IoStatus.Information =
         Stack->Parameters.QueryFile.Length - BufferLength;


@@ -491,7 +490,6 @@ CdfsSetInformation(
         break;
     }
 
         break;
     }
 

-    Irp->IoStatus.Status = Status;

     Irp->IoStatus.Information = 0;
 
     return Status;
     Irp->IoStatus.Information = 0;
 
     return Status;

diff --git a/reactos/drivers/filesystems/cdfs/rw.c b/reactos/drivers/filesystems/cdfs/rw.c
index aed8dc5..af9d2b1 100644 (file)
--- a/reactos/drivers/filesystems/cdfs/rw.c
+++ b/reactos/drivers/filesystems/cdfs/rw.c
@@ -233,15 +233,11 @@ NTSTATUS NTAPI
 CdfsWrite(
     PCDFS_IRP_CONTEXT IrpContext)
 {
 CdfsWrite(
     PCDFS_IRP_CONTEXT IrpContext)
 {

-    PIRP Irp;
-

     DPRINT("CdfsWrite(%p)\n", IrpContext);
 
     ASSERT(IrpContext);
 
     DPRINT("CdfsWrite(%p)\n", IrpContext);
 
     ASSERT(IrpContext);
 

-    Irp = IrpContext->Irp;
-    Irp->IoStatus.Status = STATUS_NOT_SUPPORTED;
-    Irp->IoStatus.Information = 0;
+    IrpContext->Irp->IoStatus.Information = 0;

     return(STATUS_NOT_SUPPORTED);
 }
 
     return(STATUS_NOT_SUPPORTED);
 }
 

diff --git a/reactos/drivers/filesystems/cdfs/volinfo.c b/reactos/drivers/filesystems/cdfs/volinfo.c
index a692f1e..2356ffe 100644 (file)
--- a/reactos/drivers/filesystems/cdfs/volinfo.c
+++ b/reactos/drivers/filesystems/cdfs/volinfo.c
@@ -266,7 +266,6 @@ CdfsQueryVolumeInformation(
             Status = STATUS_NOT_SUPPORTED;
     }
 
             Status = STATUS_NOT_SUPPORTED;
     }
 

-    Irp->IoStatus.Status = Status;

     if (NT_SUCCESS(Status))
         Irp->IoStatus.Information =
         Stack->Parameters.QueryVolume.Length - BufferLength;
     if (NT_SUCCESS(Status))
         Irp->IoStatus.Information =
         Stack->Parameters.QueryVolume.Length - BufferLength;


@@ -282,15 +281,11 @@ NTAPI
 CdfsSetVolumeInformation(
     PCDFS_IRP_CONTEXT IrpContext)
 {
 CdfsSetVolumeInformation(
     PCDFS_IRP_CONTEXT IrpContext)
 {

-    PIRP Irp;
-

     DPRINT("CdfsSetVolumeInformation() called\n");
 
     ASSERT(IrpContext);
 
     DPRINT("CdfsSetVolumeInformation() called\n");
 
     ASSERT(IrpContext);
 

-    Irp = IrpContext->Irp;
-    Irp->IoStatus.Status = STATUS_NOT_SUPPORTED;
-    Irp->IoStatus.Information = 0;
+    IrpContext->Irp->IoStatus.Information = 0;

 
     return STATUS_NOT_SUPPORTED;
 }
 
     return STATUS_NOT_SUPPORTED;
 }