From 8faad3f2aa246813d199072cc39e2a91a44c6589 Mon Sep 17 00:00:00 2001
From: Pierre Schweitzer <pierre@reactos.org>
Date: Sun, 21 Jun 2015 14:02:35 +0000
Subject: [PATCH] [CDFS] Remove redundant code now we have IRP context dispatch

svn path=/trunk/; revision=68231
---
 reactos/drivers/filesystems/cdfs/devctrl.c | 3 ---
 reactos/drivers/filesystems/cdfs/dirctl.c  | 4 ----
 reactos/drivers/filesystems/cdfs/finfo.c   | 2 --
 reactos/drivers/filesystems/cdfs/rw.c      | 6 +-----
 reactos/drivers/filesystems/cdfs/volinfo.c | 7 +------
 5 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/reactos/drivers/filesystems/cdfs/devctrl.c b/reactos/drivers/filesystems/cdfs/devctrl.c
index f2db3c302b6..7e2221a3319 100644
--- 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");
-        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))
     {
-        Irp->IoStatus.Status = 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;
-        Irp->IoStatus.Status = Status;
     }
     else
     {
diff --git a/reactos/drivers/filesystems/cdfs/dirctl.c b/reactos/drivers/filesystems/cdfs/dirctl.c
index eade96de1cb..92594b8a977 100644
--- 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;
 
-    FsRtlEnterFileSystem();
-
     switch (IrpContext->MinorFunction)
     {
     case IRP_MN_QUERY_DIRECTORY:
@@ -824,10 +822,8 @@ CdfsDirectoryControl(
 
     if (Status != STATUS_PENDING)
     {
-        Irp->IoStatus.Status = Status;
         Irp->IoStatus.Information = 0;
     }
-    FsRtlExitFileSystem();
 
     return(Status);
 }
diff --git a/reactos/drivers/filesystems/cdfs/finfo.c b/reactos/drivers/filesystems/cdfs/finfo.c
index ecb82bbca76..e0e08e1abe8 100644
--- a/reactos/drivers/filesystems/cdfs/finfo.c
+++ b/reactos/drivers/filesystems/cdfs/finfo.c
@@ -420,7 +420,6 @@ CdfsQueryInformation(
         break;
     }
 
-    Irp->IoStatus.Status = Status;
     if (NT_SUCCESS(Status) || Status == STATUS_BUFFER_OVERFLOW)
         Irp->IoStatus.Information =
         Stack->Parameters.QueryFile.Length - BufferLength;
@@ -491,7 +490,6 @@ CdfsSetInformation(
         break;
     }
 
-    Irp->IoStatus.Status = Status;
     Irp->IoStatus.Information = 0;
 
     return Status;
diff --git a/reactos/drivers/filesystems/cdfs/rw.c b/reactos/drivers/filesystems/cdfs/rw.c
index aed8dc5d2b7..af9d2b18bd4 100644
--- 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)
 {
-    PIRP Irp;
-
     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);
 }
 
diff --git a/reactos/drivers/filesystems/cdfs/volinfo.c b/reactos/drivers/filesystems/cdfs/volinfo.c
index a692f1ef3a2..2356ffebfaa 100644
--- a/reactos/drivers/filesystems/cdfs/volinfo.c
+++ b/reactos/drivers/filesystems/cdfs/volinfo.c
@@ -266,7 +266,6 @@ CdfsQueryVolumeInformation(
             Status = STATUS_NOT_SUPPORTED;
     }
 
-    Irp->IoStatus.Status = Status;
     if (NT_SUCCESS(Status))
         Irp->IoStatus.Information =
         Stack->Parameters.QueryVolume.Length - BufferLength;
@@ -282,15 +281,11 @@ NTAPI
 CdfsSetVolumeInformation(
     PCDFS_IRP_CONTEXT IrpContext)
 {
-    PIRP Irp;
-
     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;
 }