Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 04:23:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CDFS]

Browse source 
Remove redundant code now we have IRP context dispatch

svn path=/trunk/; revision=68231
This commit is contained in:
Pierre Schweitzer 2015-06-21 14:02:35 +00:00
parent a800f88087
commit 8faad3f2aa
5 changed files with 2 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

3
reactos/drivers/filesystems/cdfs/devctrl.c
View file

@ -39,14 +39,12 @@ CdfsDeviceControl(
if (!FileObject) if (!FileObject)
{ {
DPRINT1("FIXME: CdfsDeviceControl called without FileObject!\n"); DPRINT1("FIXME: CdfsDeviceControl called without FileObject!\n");
Irp->IoStatus.Status = STATUS_INVALID_DEVICE_REQUEST;
return STATUS_INVALID_DEVICE_REQUEST; return STATUS_INVALID_DEVICE_REQUEST;
} }
/* Only support such operations on volume */ /* Only support such operations on volume */
if (!(FileObject->RelatedFileObject == NULL || FileObject->RelatedFileObject->FsContext2 != NULL)) 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! */ /* We should handle this one, but we don't! */
Status = STATUS_NOT_IMPLEMENTED; Status = STATUS_NOT_IMPLEMENTED;
Irp->IoStatus.Status = Status;
} }
else else
{ {

4
reactos/drivers/filesystems/cdfs/dirctl.c
View file

@ -802,8 +802,6 @@ CdfsDirectoryControl(
Irp = IrpContext->Irp; Irp = IrpContext->Irp;
DeviceObject = IrpContext->DeviceObject; DeviceObject = IrpContext->DeviceObject;
FsRtlEnterFileSystem();
switch (IrpContext->MinorFunction) switch (IrpContext->MinorFunction)
{ {
case IRP_MN_QUERY_DIRECTORY: 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);
} }

2
reactos/drivers/filesystems/cdfs/finfo.c
View file

@ -420,7 +420,6 @@ CdfsQueryInformation(
break; break;
} }
Irp->IoStatus.Status = Status;
if (NT_SUCCESS(Status) || Status == STATUS_BUFFER_OVERFLOW) if (NT_SUCCESS(Status) || Status == STATUS_BUFFER_OVERFLOW)
Irp->IoStatus.Information = Irp->IoStatus.Information =
Stack->Parameters.QueryFile.Length - BufferLength; Stack->Parameters.QueryFile.Length - BufferLength;
@ -491,7 +490,6 @@ CdfsSetInformation(
break; break;
} }
Irp->IoStatus.Status = Status;
Irp->IoStatus.Information = 0; Irp->IoStatus.Information = 0;
return Status; return Status;

6
reactos/drivers/filesystems/cdfs/rw.c
View file

@ -233,15 +233,11 @@ NTSTATUS NTAPI
CdfsWrite( CdfsWrite(
PCDFS_IRP_CONTEXT IrpContext) PCDFS_IRP_CONTEXT IrpContext)
{ {
PIRP Irp;
DPRINT("CdfsWrite(%p)\n", IrpContext); DPRINT("CdfsWrite(%p)\n", IrpContext);
ASSERT(IrpContext); ASSERT(IrpContext);
Irp = IrpContext->Irp; IrpContext->Irp->IoStatus.Information = 0;
Irp->IoStatus.Status = STATUS_NOT_SUPPORTED;
Irp->IoStatus.Information = 0;
return(STATUS_NOT_SUPPORTED); return(STATUS_NOT_SUPPORTED);
} }

7
reactos/drivers/filesystems/cdfs/volinfo.c
View file

@ -266,7 +266,6 @@ CdfsQueryVolumeInformation(
Status = STATUS_NOT_SUPPORTED; Status = STATUS_NOT_SUPPORTED;
} }
Irp->IoStatus.Status = Status;
if (NT_SUCCESS(Status)) if (NT_SUCCESS(Status))
Irp->IoStatus.Information = Irp->IoStatus.Information =
Stack->Parameters.QueryVolume.Length - BufferLength; Stack->Parameters.QueryVolume.Length - BufferLength;
@ -282,15 +281,11 @@ NTAPI
CdfsSetVolumeInformation( CdfsSetVolumeInformation(
PCDFS_IRP_CONTEXT IrpContext) PCDFS_IRP_CONTEXT IrpContext)
{ {
PIRP Irp;
DPRINT("CdfsSetVolumeInformation() called\n"); DPRINT("CdfsSetVolumeInformation() called\n");
ASSERT(IrpContext); ASSERT(IrpContext);
Irp = IrpContext->Irp; IrpContext->Irp->IoStatus.Information = 0;
Irp->IoStatus.Status = STATUS_NOT_SUPPORTED;
Irp->IoStatus.Information = 0;
return STATUS_NOT_SUPPORTED; return STATUS_NOT_SUPPORTED;
} }