diff --git a/reactos/drivers/filesystems/fastfat/fsctl.c b/reactos/drivers/filesystems/fastfat/fsctl.c index 05e26293863..973c122c721 100644 --- a/reactos/drivers/filesystems/fastfat/fsctl.c +++ b/reactos/drivers/filesystems/fastfat/fsctl.c @@ -773,30 +773,6 @@ VfatMoveFile(PVFAT_IRP_CONTEXT IrpContext) return STATUS_INVALID_DEVICE_REQUEST; } -#ifdef USE_ROS_CC_AND_FS -static NTSTATUS -VfatRosQueryLcnMapping(PVFAT_IRP_CONTEXT IrpContext) -{ - PDEVICE_EXTENSION DeviceExt; - PROS_QUERY_LCN_MAPPING LcnQuery; - PIO_STACK_LOCATION Stack; - - DPRINT("VfatRosQueryLcnMapping(IrpContext %p)\n", IrpContext); - - DeviceExt = IrpContext->DeviceExt; - Stack = IrpContext->Stack; - if (IrpContext->Irp->AssociatedIrp.SystemBuffer == NULL || - Stack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(ROS_QUERY_LCN_MAPPING)) - { - return STATUS_BUFFER_TOO_SMALL; - } - LcnQuery = (PROS_QUERY_LCN_MAPPING)(IrpContext->Irp->AssociatedIrp.SystemBuffer); - LcnQuery->LcnDiskOffset.QuadPart = DeviceExt->FatInfo.dataStart * DeviceExt->FatInfo.BytesPerSector; - IrpContext->Irp->IoStatus.Information = sizeof(ROS_QUERY_LCN_MAPPING); - return(STATUS_SUCCESS); -} -#endif - static NTSTATUS VfatIsVolumeDirty(PVFAT_IRP_CONTEXT IrpContext) { @@ -877,11 +853,6 @@ NTSTATUS VfatFileSystemControl(PVFAT_IRP_CONTEXT IrpContext) case FSCTL_MOVE_FILE: Status = VfatMoveFile(IrpContext); break; -#ifdef USE_ROS_CC_AND_FS - case FSCTL_ROS_QUERY_LCN_MAPPING: - Status = VfatRosQueryLcnMapping(IrpContext); - break; -#endif case FSCTL_IS_VOLUME_DIRTY: Status = VfatIsVolumeDirty(IrpContext); break; diff --git a/reactos/drivers/filesystems/fastfat/vfat.h b/reactos/drivers/filesystems/fastfat/vfat.h index 0a5deb5a275..ac02d2682d2 100644 --- a/reactos/drivers/filesystems/fastfat/vfat.h +++ b/reactos/drivers/filesystems/fastfat/vfat.h @@ -2,8 +2,6 @@ #include #include -#include - #define USE_ROS_CC_AND_FS #define ROUND_DOWN(n, align) \ diff --git a/reactos/include/reactos/ccros.h b/reactos/include/reactos/ccros.h deleted file mode 100644 index 989ba476f6a..00000000000 --- a/reactos/include/reactos/ccros.h +++ /dev/null @@ -1,29 +0,0 @@ -#ifndef __INCLUDE_DDK_NTIFS_H -#define __INCLUDE_DDK_NTIFS_H - -NTSTATUS NTAPI -CcRosInitializeFileCache(PFILE_OBJECT FileObject, - ULONG CacheSegmentSize, - PCACHE_MANAGER_CALLBACKS CallBacks, - PVOID LazyWriterContext); - -NTSTATUS NTAPI -CcRosReleaseFileCache (PFILE_OBJECT FileObject); - -struct _BCB; - -VOID -NTAPI -CcRosTraceCacheMap ( - struct _BCB* Bcb, - BOOLEAN Trace ); - -#define FSCTL_ROS_QUERY_LCN_MAPPING \ - CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 63, METHOD_BUFFERED, FILE_ANY_ACCESS) - -typedef struct _ROS_QUERY_LCN_MAPPING -{ - LARGE_INTEGER LcnDiskOffset; -} ROS_QUERY_LCN_MAPPING, *PROS_QUERY_LCN_MAPPING; - -#endif /* __INCLUDE_DDK_NTIFS_H */ diff --git a/reactos/lib/fslib/vfatlib/check/vfat.h b/reactos/lib/fslib/vfatlib/check/vfat.h index 25b79d68a42..79e235737c3 100755 --- a/reactos/lib/fslib/vfatlib/check/vfat.h +++ b/reactos/lib/fslib/vfatlib/check/vfat.h @@ -3,7 +3,6 @@ #include #include #include -#include #include #include diff --git a/reactos/ntoskrnl/include/internal/cc.h b/reactos/ntoskrnl/include/internal/cc.h index f04e1979406..a2d769b646a 100644 --- a/reactos/ntoskrnl/include/internal/cc.h +++ b/reactos/ntoskrnl/include/internal/cc.h @@ -297,6 +297,21 @@ CcRosRequestCacheSegment( CACHE_SEGMENT **CacheSeg ); +NTSTATUS +NTAPI +CcRosInitializeFileCache( + PFILE_OBJECT FileObject, + ULONG CacheSegmentSize, + PCACHE_MANAGER_CALLBACKS CallBacks, + PVOID LazyWriterContext +); + +NTSTATUS +NTAPI +CcRosReleaseFileCache( + PFILE_OBJECT FileObject +); + NTSTATUS NTAPI CcTryToInitializeFileCache(PFILE_OBJECT FileObject); diff --git a/reactos/ntoskrnl/include/precomp.h b/reactos/ntoskrnl/include/precomp.h index b6ebb0207d3..9057f2023a2 100644 --- a/reactos/ntoskrnl/include/precomp.h +++ b/reactos/ntoskrnl/include/precomp.h @@ -28,8 +28,7 @@ #define TEXT(s) L##s #include -/* FIXME: Temporary until CC Ros is gone */ -#include +/* FIXME: Temporary until Winldr is used */ #include /* Disk Dump Driver Header */