[ros-diffs] [pschweitzer] 68231: [CDFS] Remove redundant code now we have IRP context dispatch

Author: pschweitzer
Date: Sun Jun 21 14:02:35 2015
New Revision: 68231

URL: http://svn.reactos.org/svn/reactos?rev=68231&view=rev
Log:
[CDFS]
Remove redundant code now we have IRP context dispatch

Modified:
    trunk/reactos/drivers/filesystems/cdfs/devctrl.c
    trunk/reactos/drivers/filesystems/cdfs/dirctl.c
    trunk/reactos/drivers/filesystems/cdfs/finfo.c
    trunk/reactos/drivers/filesystems/cdfs/rw.c
    trunk/reactos/drivers/filesystems/cdfs/volinfo.c

Modified: trunk/reactos/drivers/filesystems/cdfs/devctrl.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/de...
==============================================================================
--- trunk/reactos/drivers/filesystems/cdfs/devctrl.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/cdfs/devctrl.c	[iso-8859-1] Sun Jun 21 14:02:35 2015
@@ -39,14 +39,12 @@
     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 @@
     {
         /* We should handle this one, but we don't! */
         Status = STATUS_NOT_IMPLEMENTED;
-        Irp->IoStatus.Status = Status;
     }
     else
     {

Modified: trunk/reactos/drivers/filesystems/cdfs/dirctl.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/di...
==============================================================================
--- trunk/reactos/drivers/filesystems/cdfs/dirctl.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/cdfs/dirctl.c	[iso-8859-1] Sun Jun 21 14:02:35 2015
@@ -802,8 +802,6 @@
     Irp = IrpContext->Irp;
     DeviceObject = IrpContext->DeviceObject;

-    FsRtlEnterFileSystem();
-
     switch (IrpContext->MinorFunction)
     {
     case IRP_MN_QUERY_DIRECTORY:
@@ -824,10 +822,8 @@

if (Status != STATUS_PENDING)
     {
-        Irp->IoStatus.Status = Status;
         Irp->IoStatus.Information = 0;
     }
-    FsRtlExitFileSystem();

return(Status);
 }

Modified: trunk/reactos/drivers/filesystems/cdfs/finfo.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/fi...
==============================================================================
--- trunk/reactos/drivers/filesystems/cdfs/finfo.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/cdfs/finfo.c	[iso-8859-1] Sun Jun 21 14:02:35 2015
@@ -420,7 +420,6 @@
         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 @@
         break;
     }

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

return Status;

Modified: trunk/reactos/drivers/filesystems/cdfs/rw.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/rw...
==============================================================================
--- trunk/reactos/drivers/filesystems/cdfs/rw.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/cdfs/rw.c	[iso-8859-1] Sun Jun 21 14:02:35 2015
@@ -233,15 +233,11 @@
 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);
 }

Modified: trunk/reactos/drivers/filesystems/cdfs/volinfo.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/vo...
==============================================================================
--- trunk/reactos/drivers/filesystems/cdfs/volinfo.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/cdfs/volinfo.c	[iso-8859-1] Sun Jun 21 14:02:35 2015
@@ -266,7 +266,6 @@
             Status = STATUS_NOT_SUPPORTED;
     }

-    Irp->IoStatus.Status = Status;
     if (NT_SUCCESS(Status))
         Irp->IoStatus.Information =
         Stack->Parameters.QueryVolume.Length - BufferLength;
@@ -282,15 +281,11 @@
 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;
 }