diff --git a/reactos/drivers/filesystems/ntfs/fcb.c b/reactos/drivers/filesystems/ntfs/fcb.c index fbba5473df0..17520ecbcf3 100644 --- a/reactos/drivers/filesystems/ntfs/fcb.c +++ b/reactos/drivers/filesystems/ntfs/fcb.c @@ -152,11 +152,7 @@ NtfsReleaseFCB(PDEVICE_EXTENSION Vcb, if (Fcb->RefCount <= 0 && !NtfsFCBIsDirectory(Fcb)) { RemoveEntryList(&Fcb->FcbListEntry); -#ifdef USE_ROS_CC_AND_FS - CcRosReleaseFileCache(Fcb->FileObject); -#else CcUninitializeCacheMap (Fcb->FileObject, NULL, NULL); -#endif NtfsDestroyFCB(Fcb); } KeReleaseSpinLock(&Vcb->FcbListLock, oldIrql); @@ -242,22 +238,14 @@ NtfsFCBInitializeCache(PVCB Vcb, newCCB->PtrFileObject = FileObject; Fcb->FileObject = FileObject; Fcb->DevExt = Vcb; -#ifdef ROS_USE_CC_AND_FS - Status = CcRosInitializeFileCache(FileObject, - CACHEPAGESIZE(Vcb)); - if (!NT_SUCCESS(Status)) - { - DbgPrint("CcRosInitializeFileCache failed\n"); - KEBUGCHECK(0); - } -#else + Status = STATUS_SUCCESS; CcInitializeCacheMap(FileObject, (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), FALSE, NULL, NULL); -#endif + ObDereferenceObject(FileObject); Fcb->Flags |= FCB_CACHE_INITIALIZED; @@ -419,22 +407,12 @@ NtfsAttachFCBToFileObject(PDEVICE_EXTENSION Vcb, if (!(Fcb->Flags & FCB_CACHE_INITIALIZED)) { -#ifdef ROS_USE_CC_AND_FS - NTSTATUS Status; - Status = CcRosInitializeFileCache(FileObject, - CACHEPAGESIZE(Vcb)); - if (!NT_SUCCESS(Status)) - { - DbgPrint("CcRosInitializeFileCache failed\n"); - KEBUGCHECK(0); - } -#else - CcInitializeCacheMap(FileObject, - (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), - FALSE, - NULL, - NULL); -#endif + CcInitializeCacheMap(FileObject, + (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), + FALSE, + NULL, + NULL); + Fcb->Flags |= FCB_CACHE_INITIALIZED; } diff --git a/reactos/drivers/filesystems/ntfs/fsctl.c b/reactos/drivers/filesystems/ntfs/fsctl.c index 95cee620ab9..8519307c9d6 100644 --- a/reactos/drivers/filesystems/ntfs/fsctl.c +++ b/reactos/drivers/filesystems/ntfs/fsctl.c @@ -400,21 +400,13 @@ NtfsMountVolume(PDEVICE_OBJECT DeviceObject, // Fcb->Entry.ExtentLocationL = 0; // Fcb->Entry.DataLengthL = DeviceExt->CdInfo.VolumeSpaceSize * BLOCKSIZE; -#ifdef ROS_USE_CC_AND_FS - Status = CcRosInitializeFileCache(DeviceExt->StreamFileObject, - CACHEPAGESIZE(DeviceExt)); - if (!NT_SUCCESS (Status)) - { - DbgPrint("CcRosInitializeFileCache() failed (Status %lx)\n", Status); - goto ByeBye; - } -#else + CcInitializeCacheMap(DeviceExt->StreamFileObject, (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), FALSE, NULL, NULL); -#endif + ExInitializeResourceLite(&DeviceExt->DirResource); // ExInitializeResourceLite(&DeviceExt->FatResource); diff --git a/reactos/drivers/filesystems/ntfs/ntfs.h b/reactos/drivers/filesystems/ntfs/ntfs.h index 5aa741d8bff..200edb648f7 100644 --- a/reactos/drivers/filesystems/ntfs/ntfs.h +++ b/reactos/drivers/filesystems/ntfs/ntfs.h @@ -6,8 +6,6 @@ #include #include -#define USE_ROS_CC_AND_FS - #define CACHEPAGESIZE(pDeviceExt) \ ((pDeviceExt)->NtfsInfo.UCHARsPerCluster > PAGE_SIZE ? \ (pDeviceExt)->NtfsInfo.UCHARsPerCluster : PAGE_SIZE)