Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 32613: - Leftovers.
by fireball＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: fireball Date: Sat Mar 8 18:23:03 2008 New Revision: 32613 URL: http://svn.reactos.org/svn/reactos?rev=3D32613&view=3Drev Log: - Leftovers. Modified: trunk/reactos/include/reactos/ccros.h trunk/reactos/ntoskrnl/ntoskrnl_i386.def Modified: trunk/reactos/include/reactos/ccros.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/ccros= .h?rev=3D32613&r1=3D32612&r2=3D32613&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/include/reactos/ccros.h (original) +++ trunk/reactos/include/reactos/ccros.h Sat Mar 8 18:23:03 2008 @@ -2,8 +2,11 @@ #define __INCLUDE_DDK_NTIFS_H = NTSTATUS NTAPI -CcRosInitializeFileCache (PFILE_OBJECT FileObject, - ULONG CacheSegmentSize); +CcRosInitializeFileCache(PFILE_OBJECT FileObject, + ULONG CacheSegmentSize, + PCACHE_MANAGER_CALLBACKS CallBacks, + PVOID LazyWriterContext); + NTSTATUS NTAPI CcRosReleaseFileCache (PFILE_OBJECT FileObject); = Modified: trunk/reactos/ntoskrnl/ntoskrnl_i386.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl_i38= 6.def?rev=3D32613&r1=3D32612&r2=3D32613&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/ntoskrnl_i386.def (original) +++ trunk/reactos/ntoskrnl/ntoskrnl_i386.def Sat Mar 8 18:23:03 2008 @@ -5,7 +5,7 @@ ; ReactOS Operating System ; EXPORTS -CcRosInitializeFileCache +CcRosInitializeFileCache@16 CcRosReleaseFileCache@4 CcRosTraceCacheMap@8 CcCanIWrite@16

1 0

[fireball] 32612: - Experimentally switch fastfat driver to non-Ros Cc functions, and thus no FSD in ReactOS are using CcRos-specific functions anymore. - Assume VACB_MAPPING_GRANULARITY as a default cache segment size. - Use FSD callbacks instead of direct accessing FCB's MainResource via FileObject/FsContext. This allows removing of ObReferenceObject(FileObject) which I had to add some time ago in order to keep FileObject alive for the lazy writer thread. - IMPORTANT: Testers should thoroughly
by fireball＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: fireball Date: Sat Mar 8 17:47:41 2008 New Revision: 32612 URL: http://svn.reactos.org/svn/reactos?rev=3D32612&view=3Drev Log: - Experimentally switch fastfat driver to non-Ros Cc functions, and thus no= FSD in ReactOS are using CcRos-specific functions anymore. - Assume VACB_MAPPING_GRANULARITY as a default cache segment size. - Use FSD callbacks instead of direct accessing FCB's MainResource via File= Object/FsContext. This allows removing of ObReferenceObject(FileObject) whi= ch I had to add some time ago in order to keep FileObject alive for the laz= y writer thread. - IMPORTANT: Testers should thoroughly try this revision in order to see if= any new problems appear. If they do appear, this revision will most probab= ly be reverted by me. Modified: trunk/reactos/drivers/filesystems/fastfat/cleanup.c trunk/reactos/drivers/filesystems/fastfat/fcb.c trunk/reactos/drivers/filesystems/fastfat/fsctl.c trunk/reactos/drivers/filesystems/fastfat/rw.c trunk/reactos/ntoskrnl/cc/fs.c trunk/reactos/ntoskrnl/cc/view.c trunk/reactos/ntoskrnl/include/internal/cc.h trunk/reactos/ntoskrnl/ntoskrnl_i386.def Modified: trunk/reactos/drivers/filesystems/fastfat/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/f= astfat/cleanup.c?rev=3D32612&r1=3D32611&r2=3D32612&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/fastfat/cleanup.c (original) +++ trunk/reactos/drivers/filesystems/fastfat/cleanup.c Sat Mar 8 17:47:41= 2008 @@ -78,11 +78,7 @@ if (tmpFileObject !=3D NULL) { pFcb->FileObject =3D NULL; -#ifdef USE_ROS_CC_AND_FS - CcRosReleaseFileCache(tmpFileObject); -#else CcUninitializeCacheMap(tmpFileObject, NULL, NULL); -#endif ObDereferenceObject(tmpFileObject); } = @@ -94,14 +90,10 @@ #endif } /* Uninitialize file cache if. */ -#ifdef USE_ROS_CC_AND_FS - CcRosReleaseFileCache (FileObject); -#else if (FileObject->SectionObjectPointer->SharedCacheMap) { CcUninitializeCacheMap (FileObject, &pFcb->RFCB.FileSize, NULL= ); } -#endif if (pFcb->OpenHandleCount !=3D 0) { IoRemoveShareAccess(FileObject, &pFcb->FCBShareAccess); Modified: trunk/reactos/drivers/filesystems/fastfat/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/f= astfat/fcb.c?rev=3D32612&r1=3D32611&r2=3D32612&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/fastfat/fcb.c (original) +++ trunk/reactos/drivers/filesystems/fastfat/fcb.c Sat Mar 8 17:47:41 2008 @@ -314,10 +314,6 @@ static NTSTATUS vfatFCBInitializeCacheFromVolume (PVCB vcb, PVFATFCB fcb) { -#ifdef USE_ROS_CC_AND_FS - NTSTATUS status; - ULONG fileCacheQuantum; -#endif PFILE_OBJECT fileObject; PVFATCCB newCCB; = @@ -336,25 +332,12 @@ fcb->FileObject =3D fileObject; fcb->RefCount++; = -#ifdef USE_ROS_CC_AND_FS - fileCacheQuantum =3D (vcb->FatInfo.BytesPerCluster >=3D PAGE_SIZE) ? - vcb->FatInfo.BytesPerCluster : PAGE_SIZE; - - status =3D CcRosInitializeFileCache (fileObject, - fileCacheQuantum); - if (!NT_SUCCESS (status)) - { - DbgPrint ("CcRosInitializeFileCache failed\n"); - KEBUGCHECK (0); - } -#else /* FIXME: Guard by SEH. */ CcInitializeCacheMap(fileObject, (PCC_FILE_SIZES)(&fcb->RFCB.AllocationSize), FALSE, &VfatGlobalData->CacheMgrCallbacks, fcb); -#endif = fcb->Flags |=3D FCB_CACHE_INITIALIZED; return STATUS_SUCCESS; Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/f= astfat/fsctl.c?rev=3D32612&r1=3D32611&r2=3D32612&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/fastfat/fsctl.c (original) +++ trunk/reactos/drivers/filesystems/fastfat/fsctl.c Sat Mar 8 17:47:41 2= 008 @@ -534,28 +534,13 @@ Fcb->RFCB.ValidDataLength =3D Fcb->RFCB.FileSize; Fcb->RFCB.AllocationSize =3D Fcb->RFCB.FileSize; = -#ifdef USE_ROS_CC_AND_FS - if (DeviceExt->FatInfo.FatType !=3D FAT12) - { - Status =3D CcRosInitializeFileCache(DeviceExt->FATFileObject, CACHEP= AGESIZE(DeviceExt)); - } - else - { - Status =3D CcRosInitializeFileCache(DeviceExt->FATFileObject, 2 * PA= GE_SIZE); - } - if (!NT_SUCCESS (Status)) - { - DPRINT1 ("CcRosInitializeFileCache failed\n"); - goto ByeBye; - } -#else /* FIXME: Guard by SEH. */ CcInitializeCacheMap(DeviceExt->FATFileObject, (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), FALSE, &VfatGlobalData->CacheMgrCallbacks, Fcb); -#endif + DeviceExt->LastAvailableCluster =3D 2; ExInitializeResourceLite(&DeviceExt->DirResource); ExInitializeResourceLite(&DeviceExt->FatResource); Modified: trunk/reactos/drivers/filesystems/fastfat/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/f= astfat/rw.c?rev=3D32612&r1=3D32611&r2=3D32612&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/fastfat/rw.c (original) +++ trunk/reactos/drivers/filesystems/fastfat/rw.c Sat Mar 8 17:47:41 2008 @@ -671,19 +671,12 @@ CHECKPOINT; if (IrpContext->FileObject->PrivateCacheMap =3D=3D NULL) { -#ifdef USE_ROS_CC_AND_FS - ULONG CacheSize; - CacheSize =3D max(IrpContext->DeviceExt->FatInfo.BytesPerCluster, - 8 * PAGE_SIZE); - CcRosInitializeFileCache(IrpContext->FileObject, CacheSize); -#else /* FIXME: Guard by SEH. */ CcInitializeCacheMap(IrpContext->FileObject, (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), FALSE, &(VfatGlobalData->CacheMgrCallbacks), Fcb); -#endif } if (!CcCopyRead(IrpContext->FileObject, &ByteOffset, Length, (BOOLEAN)(IrpContext->Flags & IRPCONTEXT_CANWAIT), B= uffer, @@ -972,19 +965,12 @@ = if (IrpContext->FileObject->PrivateCacheMap =3D=3D NULL) { -#ifdef USE_ROS_CC_AND_FS - ULONG CacheSize; - CacheSize =3D max(IrpContext->DeviceExt->FatInfo.BytesPerCluster, - 8 * PAGE_SIZE); - CcRosInitializeFileCache(IrpContext->FileObject, CacheSize); -#else /* FIXME: Guard by SEH. */ CcInitializeCacheMap(IrpContext->FileObject, (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), FALSE, &VfatGlobalData->CacheMgrCallbacks, Fcb); -#endif } if (ByteOffset.QuadPart > OldFileSize.QuadPart) { Modified: trunk/reactos/ntoskrnl/cc/fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/fs.c?rev= =3D32612&r1=3D32611&r2=3D32612&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/cc/fs.c (original) +++ trunk/reactos/ntoskrnl/cc/fs.c Sat Mar 8 17:47:41 2008 @@ -92,7 +92,8 @@ = /* Call old ROS cache init function */ CcRosInitializeFileCache(FileObject, - PAGE_SIZE/*VACB_MAPPING_GRANULARITY*/); + /*PAGE_SIZE*/ VACB_MAPPING_GRANULARITY, CallBacks, + LazyWriterContext); } = /* Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?re= v=3D32612&r1=3D32611&r2=3D32612&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/cc/view.c (original) +++ trunk/reactos/ntoskrnl/cc/view.c Sat Mar 8 17:47:41 2008 @@ -238,23 +238,19 @@ DirtySegmentListEntry); current_entry =3D current_entry->Flink; = - /* This Ros-specific function needs FileObject to be referenced, - ohterwise it may be deleted while this function still works - with it */ - ObReferenceObject(current->Bcb->FileObject); - - Locked =3D ExTryToAcquireResourceExclusiveLite(((FSRTL_COMMON_FCB_= HEADER*)(current->Bcb->FileObject->FsContext))->Resource); + Locked =3D current->Bcb->Callbacks->AcquireForLazyWrite( + current->Bcb->LazyWriteContext, FALSE); if (!Locked) { - ObDereferenceObject(current->Bcb->FileObject); continue; } = Locked =3D ExTryToAcquirePushLockExclusive(&current->Lock); if (!Locked) { - ExReleaseResourceLite(((FSRTL_COMMON_FCB_HEADER*)(current->Bcb= ->FileObject->FsContext))->Resource); - ObDereferenceObject(current->Bcb->FileObject); + current->Bcb->Callbacks->ReleaseFromLazyWrite( + current->Bcb->LazyWriteContext); + continue; } = @@ -262,20 +258,20 @@ if (current->ReferenceCount > 1) { ExReleasePushLock(&current->Lock); - ExReleaseResourceLite(((FSRTL_COMMON_FCB_HEADER*)(current->Bcb= ->FileObject->FsContext))->Resource); - ObDereferenceObject(current->Bcb->FileObject); + current->Bcb->Callbacks->ReleaseFromLazyWrite( + current->Bcb->LazyWriteContext); continue; } = PagesPerSegment =3D current->Bcb->CacheSegmentSize / PAGE_SIZE; = KeReleaseGuardedMutex(&ViewLock); - = + Status =3D CcRosFlushCacheSegment(current); = ExReleasePushLock(&current->Lock); - ExReleaseResourceLite(((FSRTL_COMMON_FCB_HEADER*)(current->Bcb->Fi= leObject->FsContext))->Resource); - ObDereferenceObject(current->Bcb->FileObject); + current->Bcb->Callbacks->ReleaseFromLazyWrite( + current->Bcb->LazyWriteContext); = if (!NT_SUCCESS(Status) && (Status !=3D STATUS_END_OF_FILE)) { @@ -711,7 +707,7 @@ KEBUGCHECKCC; } #endif - Pfn =3D alloca(sizeof(PFN_TYPE) * (Bcb->CacheSegmentSize / PAGE_SIZE)); + Pfn =3D alloca(sizeof(PFN_TYPE) * ((Bcb->CacheSegmentSize / PAGE_SIZE))); for (i =3D 0; i < (Bcb->CacheSegmentSize / PAGE_SIZE); i++) { Status =3D MmRequestPageMemoryConsumer(MC_CACHE, TRUE, &Pfn[i]); @@ -729,6 +725,7 @@ { KEBUGCHECKCC; } + return(STATUS_SUCCESS); } = @@ -1259,9 +1256,11 @@ } = = -NTSTATUS STDCALL +NTSTATUS NTAPI CcRosInitializeFileCache(PFILE_OBJECT FileObject, - ULONG CacheSegmentSize) + ULONG CacheSegmentSize, + PCACHE_MANAGER_CALLBACKS CallBacks, + PVOID LazyWriterContext) /* * FUNCTION: Initializes a BCB for a file object */ @@ -1275,39 +1274,41 @@ KeAcquireGuardedMutex(&ViewLock); if (Bcb =3D=3D NULL) { - Bcb =3D ExAllocateFromNPagedLookasideList(&BcbLookasideList); - if (Bcb =3D=3D NULL) - { - KeReleaseGuardedMutex(&ViewLock); - return(STATUS_UNSUCCESSFUL); - } - memset(Bcb, 0, sizeof(BCB)); - ObReferenceObjectByPointer(FileObject, - FILE_ALL_ACCESS, - NULL, - KernelMode); - Bcb->FileObject =3D FileObject; - Bcb->CacheSegmentSize =3D CacheSegmentSize; - if (FileObject->FsContext) - { - Bcb->AllocationSize =3D - ((PFSRTL_COMMON_FCB_HEADER)FileObject->FsContext)->AllocationSize; - Bcb->FileSize =3D - ((PFSRTL_COMMON_FCB_HEADER)FileObject->FsContext)->FileSize; - } - KeInitializeSpinLock(&Bcb->BcbLock); - InitializeListHead(&Bcb->BcbSegmentListHead); - FileObject->SectionObjectPointer->SharedCacheMap =3D Bcb; + Bcb =3D ExAllocateFromNPagedLookasideList(&BcbLookasideList); + if (Bcb =3D=3D NULL) + { + KeReleaseGuardedMutex(&ViewLock); + return(STATUS_UNSUCCESSFUL); + } + memset(Bcb, 0, sizeof(BCB)); + ObReferenceObjectByPointer(FileObject, + FILE_ALL_ACCESS, + NULL, + KernelMode); + Bcb->FileObject =3D FileObject; + Bcb->CacheSegmentSize =3D CacheSegmentSize; + Bcb->Callbacks =3D CallBacks; + Bcb->LazyWriteContext =3D LazyWriterContext; + if (FileObject->FsContext) + { + Bcb->AllocationSize =3D + ((PFSRTL_COMMON_FCB_HEADER)FileObject->FsContext)->Allocati= onSize; + Bcb->FileSize =3D + ((PFSRTL_COMMON_FCB_HEADER)FileObject->FsContext)->FileSize; + } + KeInitializeSpinLock(&Bcb->BcbLock); + InitializeListHead(&Bcb->BcbSegmentListHead); + FileObject->SectionObjectPointer->SharedCacheMap =3D Bcb; } if (FileObject->PrivateCacheMap =3D=3D NULL) { - FileObject->PrivateCacheMap =3D Bcb; - Bcb->RefCount++; + FileObject->PrivateCacheMap =3D Bcb; + Bcb->RefCount++; } if (Bcb->BcbRemoveListEntry.Flink !=3D NULL) { - RemoveEntryList(&Bcb->BcbRemoveListEntry); - Bcb->BcbRemoveListEntry.Flink =3D NULL; + RemoveEntryList(&Bcb->BcbRemoveListEntry); + Bcb->BcbRemoveListEntry.Flink =3D NULL; } KeReleaseGuardedMutex(&ViewLock); = Modified: trunk/reactos/ntoskrnl/include/internal/cc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/inte= rnal/cc.h?rev=3D32612&r1=3D32611&r2=3D32612&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/include/internal/cc.h (original) +++ trunk/reactos/ntoskrnl/include/internal/cc.h Sat Mar 8 17:47:41 2008 @@ -112,6 +112,8 @@ ULONG CacheSegmentSize; LARGE_INTEGER AllocationSize; LARGE_INTEGER FileSize; + PCACHE_MANAGER_CALLBACKS Callbacks; + PVOID LazyWriteContext; KSPIN_LOCK BcbLock; ULONG RefCount; #if defined(DBG) || defined(KDBG) Modified: trunk/reactos/ntoskrnl/ntoskrnl_i386.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl_i38= 6.def?rev=3D32612&r1=3D32611&r2=3D32612&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/ntoskrnl_i386.def (original) +++ trunk/reactos/ntoskrnl/ntoskrnl_i386.def Sat Mar 8 17:47:41 2008 @@ -5,7 +5,7 @@ ; ReactOS Operating System ; EXPORTS -CcRosInitializeFileCache@8 +CcRosInitializeFileCache CcRosReleaseFileCache@4 CcRosTraceCacheMap@8 CcCanIWrite@16

1 0

[pschweitzer] 32611: Added stubs for CC R/W functions (fixes TODO from r32610)
by pschweitzer＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: pschweitzer Date: Sat Mar 8 14:17:48 2008 New Revision: 32611 URL: http://svn.reactos.org/svn/reactos?rev=3D32611&view=3Drev Log: Added stubs for CC R/W functions (fixes TODO from r32610) Added: trunk/reactos/drivers/filesystems/ntfs/fastio.c (with props) Modified: trunk/reactos/drivers/filesystems/ntfs/fcb.c trunk/reactos/drivers/filesystems/ntfs/fsctl.c trunk/reactos/drivers/filesystems/ntfs/ntfs.c trunk/reactos/drivers/filesystems/ntfs/ntfs.h trunk/reactos/drivers/filesystems/ntfs/ntfs.rbuild Added: trunk/reactos/drivers/filesystems/ntfs/fastio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/n= tfs/fastio.c?rev=3D32611&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/ntfs/fastio.c (added) +++ trunk/reactos/drivers/filesystems/ntfs/fastio.c Sat Mar 8 14:17:48 2008 @@ -1,0 +1,64 @@ +/* + * ReactOS kernel + * Copyright (C) 2002 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: drivers/filesystem/ntfs/fastio.c + * PURPOSE: NTFS filesystem driver + * PROGRAMMER: Pierre Schweitzer = + */ + +/* INCLUDES **************************************************************= ***/ + +#include <ntddk.h> + +#define NDEBUG +#include <debug.h> + +#include "ntfs.h" + + +/* FUNCTIONS *************************************************************= ***/ + +BOOLEAN NTAPI +NtfsAcqLazyWrite(PVOID Context, + BOOLEAN Wait) +{ + UNIMPLEMENTED; + return FALSE; +} + +VOID NTAPI +NtfsRelLazyWrite(PVOID Context) +{ + UNIMPLEMENTED; +} + +BOOLEAN NTAPI +NtfsAcqReadAhead(PVOID Context, + BOOLEAN Wait) +{ + UNIMPLEMENTED; + return FALSE; +} + +VOID NTAPI +NtfsRelReadAhead(PVOID Context) +{ + UNIMPLEMENTED; +} Propchange: trunk/reactos/drivers/filesystems/ntfs/fastio.c ---------------------------------------------------------------------------= --- svn:eol-style =3D native Modified: trunk/reactos/drivers/filesystems/ntfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/n= tfs/fcb.c?rev=3D32611&r1=3D32610&r2=3D32611&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/ntfs/fcb.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/fcb.c Sat Mar 8 14:17:48 2008 @@ -243,8 +243,8 @@ CcInitializeCacheMap(FileObject, (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), FALSE, - NULL, - NULL); + &(NtfsGlobalData->CacheMgrCallbacks), + Fcb); = ObDereferenceObject(FileObject); Fcb->Flags |=3D FCB_CACHE_INITIALIZED; Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/n= tfs/fsctl.c?rev=3D32611&r1=3D32610&r2=3D32611&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/ntfs/fsctl.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/fsctl.c Sat Mar 8 14:17:48 2008 @@ -404,8 +404,8 @@ CcInitializeCacheMap(DeviceExt->StreamFileObject, (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), FALSE, - NULL, - NULL); + &(NtfsGlobalData->CacheMgrCallbacks), + Fcb); = ExInitializeResourceLite(&DeviceExt->DirResource); // ExInitializeResourceLite(&DeviceExt->FatResource); Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/n= tfs/ntfs.c?rev=3D32611&r1=3D32610&r2=3D32611&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/ntfs/ntfs.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.c Sat Mar 8 14:17:48 2008 @@ -72,6 +72,13 @@ = /* Initialize IRP functions array */ NtfsInitializeFunctionPointers(DriverObject); + = + /* Initialize CC functions array */ + NtfsGlobalData->CacheMgrCallbacks.AcquireForLazyWrite =3D NtfsAcqLazyWri= te; = + NtfsGlobalData->CacheMgrCallbacks.ReleaseFromLazyWrite =3D NtfsRelLazyWr= ite; = + NtfsGlobalData->CacheMgrCallbacks.AcquireForReadAhead =3D NtfsAcqReadAhe= ad; = + NtfsGlobalData->CacheMgrCallbacks.ReleaseFromReadAhead =3D NtfsRelReadAh= ead; = + /* Driver can't be unloaded */ DriverObject->DriverUnload =3D NULL; = Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/n= tfs/ntfs.h?rev=3D32611&r1=3D32610&r2=3D32611&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h Sat Mar 8 14:17:48 2008 @@ -166,6 +166,7 @@ ERESOURCE Resource; PDRIVER_OBJECT DriverObject; PDEVICE_OBJECT DeviceObject; + CACHE_MANAGER_CALLBACKS CacheMgrCallbacks; ULONG Flags; } NTFS_GLOBAL_DATA, *PNTFS_GLOBAL_DATA; = @@ -401,6 +402,21 @@ NtfsFsdDispatch(PDEVICE_OBJECT DeviceObject, PIRP Irp); = +/* fastio.c */ +BOOLEAN NTAPI +NtfsAcqLazyWrite(PVOID Context, + BOOLEAN Wait); + +VOID NTAPI +NtfsRelLazyWrite(PVOID Context); + +BOOLEAN NTAPI +NtfsAcqReadAhead(PVOID Context, + BOOLEAN Wait); + +VOID NTAPI +NtfsRelReadAhead(PVOID Context); + /* fcb.c */ = PFCB Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/n= tfs/ntfs.rbuild?rev=3D32611&r1=3D32610&r2=3D32611&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/ntfs/ntfs.rbuild (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.rbuild Sat Mar 8 14:17:48 = 2008 @@ -11,6 +11,7 @@ <file>create.c</file> <file>dirctl.c</file> <file>dispatch.c</file> + <file>fastio.c</file> <file>fcb.c</file> <file>finfo.c</file> <file>fsctl.c</file>

1 0

[fireball] 32610: - Remove ros-specific Cc functions usage. - TODO: Provide callbacks for lazy writer and read ahead when calling CcInitializeCacheMap. Could be done similar to r32607 for CDFS.
by fireball＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: fireball Date: Sat Mar 8 13:14:41 2008 New Revision: 32610 URL: http://svn.reactos.org/svn/reactos?rev=3D32610&view=3Drev Log: - Remove ros-specific Cc functions usage. - TODO: Provide callbacks for lazy writer and read ahead when calling CcIni= tializeCacheMap. Could be done similar to r32607 for CDFS. Modified: trunk/reactos/drivers/filesystems/ntfs/fcb.c trunk/reactos/drivers/filesystems/ntfs/fsctl.c trunk/reactos/drivers/filesystems/ntfs/ntfs.h Modified: trunk/reactos/drivers/filesystems/ntfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/n= tfs/fcb.c?rev=3D32610&r1=3D32609&r2=3D32610&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/ntfs/fcb.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/fcb.c Sat Mar 8 13:14:41 2008 @@ -152,11 +152,7 @@ if (Fcb->RefCount <=3D 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 @@ newCCB->PtrFileObject =3D FileObject; Fcb->FileObject =3D FileObject; Fcb->DevExt =3D Vcb; -#ifdef ROS_USE_CC_AND_FS - Status =3D CcRosInitializeFileCache(FileObject, - CACHEPAGESIZE(Vcb)); - if (!NT_SUCCESS(Status)) - { - DbgPrint("CcRosInitializeFileCache failed\n"); - KEBUGCHECK(0); - } -#else + Status =3D STATUS_SUCCESS; CcInitializeCacheMap(FileObject, (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), FALSE, NULL, NULL); -#endif + ObDereferenceObject(FileObject); Fcb->Flags |=3D FCB_CACHE_INITIALIZED; = @@ -419,22 +407,12 @@ = if (!(Fcb->Flags & FCB_CACHE_INITIALIZED)) { -#ifdef ROS_USE_CC_AND_FS - NTSTATUS Status; - Status =3D 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 |=3D FCB_CACHE_INITIALIZED; } = Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/n= tfs/fsctl.c?rev=3D32610&r1=3D32609&r2=3D32610&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/ntfs/fsctl.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/fsctl.c Sat Mar 8 13:14:41 2008 @@ -400,21 +400,13 @@ = // Fcb->Entry.ExtentLocationL =3D 0; // Fcb->Entry.DataLengthL =3D DeviceExt->CdInfo.VolumeSpaceSize * BLOCKSI= ZE; -#ifdef ROS_USE_CC_AND_FS - Status =3D 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); = Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/n= tfs/ntfs.h?rev=3D32610&r1=3D32609&r2=3D32610&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h Sat Mar 8 13:14:41 2008 @@ -5,8 +5,6 @@ #include <ntddk.h> #include <ntdddisk.h> #include <ccros.h> - -#define USE_ROS_CC_AND_FS = #define CACHEPAGESIZE(pDeviceExt) \ ((pDeviceExt)->NtfsInfo.UCHARsPerCluster > PAGE_SIZE ? \

1 0

[navaraf] 32609: Workaround a buggy UINT_PTR definition in the include\host\typedefs.h for 64-bit *nix hosts.
by navaraf＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: navaraf Date: Sat Mar 8 12:50:58 2008 New Revision: 32609 URL: http://svn.reactos.org/svn/reactos?rev=3D32609&view=3Drev Log: Workaround a buggy UINT_PTR definition in the include\host\typedefs.h for 6= 4-bit *nix hosts. Modified: trunk/reactos/tools/winebuild/res32.c Modified: trunk/reactos/tools/winebuild/res32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/res32= .c?rev=3D32609&r1=3D32608&r2=3D32609&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/winebuild/res32.c (original) +++ trunk/reactos/tools/winebuild/res32.c Sat Mar 8 12:50:58 2008 @@ -207,7 +207,7 @@ res->data =3D file_pos - 2*sizeof(DWORD) + hdr_size; get_string( &res->type ); get_string( &res->name ); - if ((UINT_PTR)file_pos & 2) get_word(); /* align to dword boundary */ + if ((ULONG_PTR)file_pos & 2) get_word(); /* align to dword boundary */ get_dword(); /* skip data version */ get_word(); /* skip mem options */ res->lang =3D get_word();

1 0

[navaraf] 32608: Fix the build.
by navaraf＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: navaraf Date: Sat Mar 8 12:08:52 2008 New Revision: 32608 URL: http://svn.reactos.org/svn/reactos?rev=3D32608&view=3Drev Log: Fix the build. Modified: trunk/irc/TechBot/TechBot.Library/TechBot.Library.csproj Modified: trunk/irc/TechBot/TechBot.Library/TechBot.Library.csproj URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/T= echBot.Library.csproj?rev=3D32608&r1=3D32607&r2=3D32608&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/irc/TechBot/TechBot.Library/TechBot.Library.csproj (original) +++ trunk/irc/TechBot/TechBot.Library/TechBot.Library.csproj Sat Mar 8 12:= 08:52 2008 @@ -47,7 +47,7 @@ <Compile Include=3D"ErrorCommand.cs" /> <Compile Include=3D"HelpCommand.cs" /> <Compile Include=3D"HresultCommand.cs" /> - <Compile Include=3D"ICommand.cs" /> + <Compile Include=3D"Command.cs" /> <Compile Include=3D"IrcService.cs" /> <Compile Include=3D"MessageContext.cs" /> <Compile Include=3D"NtStatusCommand.cs" />

1 0

[fireball] 32607: - Pass cache manager callbacks structure at every CcInitializeCacheMap() call, it's mandatory.
by fireball＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: fireball Date: Sat Mar 8 11:35:32 2008 New Revision: 32607 URL: http://svn.reactos.org/svn/reactos?rev=3D32607&view=3Drev Log: - Pass cache manager callbacks structure at every CcInitializeCacheMap() ca= ll, it's mandatory. Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.c trunk/reactos/drivers/filesystems/cdfs/cdfs.h trunk/reactos/drivers/filesystems/cdfs/fcb.c trunk/reactos/drivers/filesystems/cdfs/fsctl.c trunk/reactos/drivers/filesystems/cdfs/rw.c Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/c= dfs/cdfs.c?rev=3D32607&r1=3D32606&r2=3D32607&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/cdfs/cdfs.c (original) +++ trunk/reactos/drivers/filesystems/cdfs/cdfs.c Sat Mar 8 11:35:32 2008 @@ -33,7 +33,7 @@ #define NDEBUG #include <debug.h> = -/* FUNCTIONS *************************************************************= ***/ +/* GLOBALS ***************************************************************= ***/ = PCDFS_GLOBAL_DATA CdfsGlobalData; = @@ -98,9 +98,41 @@ = DriverObject->DriverUnload =3D NULL; = + /* Cache manager */ + CdfsGlobalData->CacheMgrCallbacks.AcquireForLazyWrite =3D CdfsAcquireFor= LazyWrite; + CdfsGlobalData->CacheMgrCallbacks.ReleaseFromLazyWrite =3D CdfsReleaseFr= omLazyWrite; + CdfsGlobalData->CacheMgrCallbacks.AcquireForReadAhead =3D CdfsAcquireFor= LazyWrite; + CdfsGlobalData->CacheMgrCallbacks.ReleaseFromReadAhead =3D CdfsReleaseFr= omLazyWrite; + IoRegisterFileSystem(DeviceObject); DeviceObject->Flags &=3D ~DO_DEVICE_INITIALIZING; = return(STATUS_SUCCESS); } = + +BOOLEAN NTAPI +CdfsAcquireForLazyWrite(IN PVOID Context, + IN BOOLEAN Wait) +{ + PFCB Fcb =3D (PFCB)Context; + ASSERT(Fcb); + DPRINT("CdfsAcquireForLazyWrite(): Fcb %p\n", Fcb); + + if (!ExAcquireResourceExclusiveLite(&(Fcb->MainResource), Wait)) + { + DPRINT("CdfsAcquireForLazyWrite(): ExReleaseResourceLite failed.\n"); + return FALSE; + } + return TRUE; +} + +VOID NTAPI +CdfsReleaseFromLazyWrite(IN PVOID Context) +{ + PFCB Fcb =3D (PFCB)Context; + ASSERT(Fcb); + DPRINT("CdfsReleaseFromLazyWrite(): Fcb %p\n", Fcb); + + ExReleaseResourceLite(&(Fcb->MainResource)); +} Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/c= dfs/cdfs.h?rev=3D32607&r1=3D32606&r2=3D32607&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/cdfs/cdfs.h (original) +++ trunk/reactos/drivers/filesystems/cdfs/cdfs.h Sat Mar 8 11:35:32 2008 @@ -178,6 +178,7 @@ { FSRTL_COMMON_FCB_HEADER RFCB; SECTION_OBJECT_POINTERS SectionObjectPointers; + ERESOURCE MainResource; ERESOURCE PagingIoResource; = PFILE_OBJECT FileObject; @@ -188,8 +189,6 @@ WCHAR *ObjectName; /* point on filename (250 chars max) in PathName */ WCHAR PathName[MAX_PATH]; /* path+filename 260 max */ WCHAR ShortNameBuffer[13]; - - ERESOURCE MainResource; = LIST_ENTRY FcbListEntry; struct _FCB* ParentFcb; @@ -233,6 +232,7 @@ PDRIVER_OBJECT DriverObject; PDEVICE_OBJECT DeviceObject; ULONG Flags; + CACHE_MANAGER_CALLBACKS CacheMgrCallbacks; } CDFS_GLOBAL_DATA, *PCDFS_GLOBAL_DATA; = extern PCDFS_GLOBAL_DATA CdfsGlobalData; @@ -418,4 +418,11 @@ DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath); = +BOOLEAN NTAPI +CdfsAcquireForLazyWrite(IN PVOID Context, + IN BOOLEAN Wait); + +VOID NTAPI +CdfsReleaseFromLazyWrite(IN PVOID Context); + #endif //CDFS_H Modified: trunk/reactos/drivers/filesystems/cdfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/c= dfs/fcb.c?rev=3D32607&r1=3D32606&r2=3D32607&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/cdfs/fcb.c (original) +++ trunk/reactos/drivers/filesystems/cdfs/fcb.c Sat Mar 8 11:35:32 2008 @@ -245,8 +245,8 @@ CcInitializeCacheMap(FileObject, (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), FALSE, - NULL, - NULL); + &(CdfsGlobalData->CacheMgrCallbacks), + Fcb); = ObDereferenceObject(FileObject); Fcb->Flags |=3D FCB_CACHE_INITIALIZED; @@ -430,8 +430,8 @@ CcInitializeCacheMap(FileObject, (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), FALSE, - NULL, - NULL); + &(CdfsGlobalData->CacheMgrCallbacks), + Fcb); Fcb->Flags |=3D FCB_CACHE_INITIALIZED; } = Modified: trunk/reactos/drivers/filesystems/cdfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/c= dfs/fsctl.c?rev=3D32607&r1=3D32606&r2=3D32607&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/cdfs/fsctl.c (original) +++ trunk/reactos/drivers/filesystems/cdfs/fsctl.c Sat Mar 8 11:35:32 2008 @@ -402,8 +402,8 @@ CcInitializeCacheMap(DeviceExt->StreamFileObject, (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), TRUE, - NULL, - NULL); + &(CdfsGlobalData->CacheMgrCallbacks), + Fcb); = ExInitializeResourceLite(&DeviceExt->VcbResource); ExInitializeResourceLite(&DeviceExt->DirResource); Modified: trunk/reactos/drivers/filesystems/cdfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/c= dfs/rw.c?rev=3D32607&r1=3D32606&r2=3D32607&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/cdfs/rw.c (original) +++ trunk/reactos/drivers/filesystems/cdfs/rw.c Sat Mar 8 11:35:32 2008 @@ -85,8 +85,8 @@ CcInitializeCacheMap(FileObject, (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), FALSE, - NULL, - NULL); + &(CdfsGlobalData->CacheMgrCallbacks), + Fcb); } = FileOffset.QuadPart =3D (LONGLONG)ReadOffset;

1 0

[fireball] 32606: - Remove ugly hack from gdiobj.c, official sorry to Timo Kreuzer, his changes were perfect! - Temporary disable MPW thread shutdown and forcing page flush, since it results in memory corruption.
by fireball＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: fireball Date: Fri Mar 7 21:49:38 2008 New Revision: 32606 URL: http://svn.reactos.org/svn/reactos?rev=3D32606&view=3Drev Log: - Remove ugly hack from gdiobj.c, official sorry to Timo Kreuzer, his chang= es were perfect! - Temporary disable MPW thread shutdown and forcing page flush, since it re= sults in memory corruption. Modified: trunk/reactos/ntoskrnl/mm/mminit.c trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?= rev=3D32606&r1=3D32605&r2=3D32606&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/mm/mminit.c (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c Fri Mar 7 21:49:38 2008 @@ -73,6 +73,7 @@ NTAPI MiShutdownMemoryManager(VOID) { +#if 0 ULONG PagesWritten; PETHREAD Thread; = @@ -100,6 +101,7 @@ There will be no other chance to do this later, since filesystems are going to be shut down. */ CcRosFlushDirtyPages(128, &PagesWritten); +#endif } = VOID Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/objects/gdiobj.c?rev=3D32606&r1=3D32605&r2=3D32606&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Fri Mar 7 21:49= :38 2008 @@ -1318,16 +1318,6 @@ { POBJ Object =3D Entry->KernelData; = - /* HACK: Introduced very recently, probably by Timo's chan= ges */ - if ((ULONG_PTR)Object < 0x80000000) - { - DPRINT1("KernelData is invalid (%p) for Entry %p!!!\n", - Object, Entry); - - /* Hopefully someone is going to solve this issue */ - return; - } - PrevThread =3D Object->Tid; if (Object->cExclusiveLock =3D=3D 0 || PrevThread =3D=3D T= hread) {

1 0

[fireball] 32605: - One leftover from 32604.
by fireball＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: fireball Date: Fri Mar 7 20:15:14 2008 New Revision: 32605 URL: http://svn.reactos.org/svn/reactos?rev=3D32605&view=3Drev Log: - One leftover from 32604. Modified: trunk/reactos/drivers/filesystems/cdfs/rw.c Modified: trunk/reactos/drivers/filesystems/cdfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/c= dfs/rw.c?rev=3D32605&r1=3D32604&r2=3D32605&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/cdfs/rw.c (original) +++ trunk/reactos/drivers/filesystems/cdfs/rw.c Fri Mar 7 20:15:14 2008 @@ -82,15 +82,11 @@ = if (FileObject->PrivateCacheMap =3D=3D NULL) { -#ifdef ROS_USE_CC_AND_FS - CcRosInitializeFileCache(FileObject, PAGE_SIZE); -#else CcInitializeCacheMap(FileObject, (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), FALSE, NULL, NULL); -#endif } = FileOffset.QuadPart =3D (LONGLONG)ReadOffset;

1 0

[fireball] 32604: - There is no reason for CDFS to use CcRos-specific functions, it ends up with the same CcRosInit/Uninit with the same CacheSegmentSize = PAGE_SIZE. However, CDFS is probably still hardly compatible with a real NT kernel.
by fireball＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: fireball Date: Fri Mar 7 18:38:43 2008 New Revision: 32604 URL: http://svn.reactos.org/svn/reactos?rev=3D32604&view=3Drev Log: - There is no reason for CDFS to use CcRos-specific functions, it ends up w= ith the same CcRosInit/Uninit with the same CacheSegmentSize =3D PAGE_SIZE.= However, CDFS is probably still hardly compatible with a real NT kernel. Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.h trunk/reactos/drivers/filesystems/cdfs/cleanup.c trunk/reactos/drivers/filesystems/cdfs/fcb.c trunk/reactos/drivers/filesystems/cdfs/fsctl.c trunk/reactos/ntoskrnl/cc/fs.c Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/c= dfs/cdfs.h?rev=3D32604&r1=3D32603&r2=3D32604&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/cdfs/cdfs.h (original) +++ trunk/reactos/drivers/filesystems/cdfs/cdfs.h Fri Mar 7 18:38:43 2008 @@ -5,8 +5,6 @@ #include <ntddk.h> #include <ntddcdrm.h> #include <ccros.h> - -#define USE_ROS_CC_AND_FS = #define CDFS_BASIC_SECTOR 2048 #define CDFS_PRIMARY_DESCRIPTOR_LOCATION 16 Modified: trunk/reactos/drivers/filesystems/cdfs/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/c= dfs/cleanup.c?rev=3D32604&r1=3D32603&r2=3D32604&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/cdfs/cleanup.c (original) +++ trunk/reactos/drivers/filesystems/cdfs/cleanup.c Fri Mar 7 18:38:43 20= 08 @@ -51,11 +51,7 @@ /* Uninitialize file cache if initialized for this file object. */ if (FileObject->SectionObjectPointer && FileObject->SectionObjectPointer= ->SharedCacheMap) { -#ifdef USE_ROS_CC_AND_FS - CcRosReleaseFileCache (FileObject); -#else CcUninitializeCacheMap (FileObject, NULL, NULL); -#endif } = return STATUS_SUCCESS; Modified: trunk/reactos/drivers/filesystems/cdfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/c= dfs/fcb.c?rev=3D32604&r1=3D32603&r2=3D32604&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/cdfs/fcb.c (original) +++ trunk/reactos/drivers/filesystems/cdfs/fcb.c Fri Mar 7 18:38:43 2008 @@ -241,22 +241,12 @@ Fcb->FileObject =3D FileObject; Fcb->DevExt =3D Vcb; = -#ifdef USE_ROS_AND_FS - Status =3D CcRosInitializeFileCache(FileObject, - PAGE_SIZE); - if (!NT_SUCCESS(Status)) - { - DbgPrint("CcRosInitializeFileCache failed\n"); - KEBUGCHECK(0); - } -#else Status =3D STATUS_SUCCESS; CcInitializeCacheMap(FileObject, (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), FALSE, NULL, NULL); -#endif = ObDereferenceObject(FileObject); Fcb->Flags |=3D FCB_CACHE_INITIALIZED; @@ -437,22 +427,11 @@ = if (CdfsFCBIsDirectory(Fcb)) { -#ifdef USE_ROS_CC_AND_FS - NTSTATUS Status; - Status =3D CcRosInitializeFileCache(FileObject, - PAGE_SIZE); - if (!NT_SUCCESS(Status)) - { - DbgPrint("CcRosInitializeFileCache failed\n"); - KEBUGCHECK(0); - } -#else CcInitializeCacheMap(FileObject, (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), FALSE, NULL, NULL); -#endif Fcb->Flags |=3D FCB_CACHE_INITIALIZED; } = Modified: trunk/reactos/drivers/filesystems/cdfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/c= dfs/fsctl.c?rev=3D32604&r1=3D32603&r2=3D32604&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/cdfs/fsctl.c (original) +++ trunk/reactos/drivers/filesystems/cdfs/fsctl.c Fri Mar 7 18:38:43 2008 @@ -398,21 +398,13 @@ = Fcb->Entry.ExtentLocationL =3D 0; Fcb->Entry.DataLengthL =3D (DeviceExt->CdInfo.VolumeSpaceSize + DeviceEx= t->CdInfo.VolumeOffset) * BLOCKSIZE; -#ifdef USE_ROS_CC_AND_FS - Status =3D CcRosInitializeFileCache(DeviceExt->StreamFileObject, - PAGE_SIZE); - if (!NT_SUCCESS (Status)) - { - DbgPrint("CcRosInitializeFileCache failed\n"); - goto ByeBye; - } -#else + CcInitializeCacheMap(DeviceExt->StreamFileObject, (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), TRUE, NULL, NULL); -#endif + ExInitializeResourceLite(&DeviceExt->VcbResource); ExInitializeResourceLite(&DeviceExt->DirResource); = Modified: trunk/reactos/ntoskrnl/cc/fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/fs.c?rev= =3D32604&r1=3D32603&r2=3D32604&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/cc/fs.c (original) +++ trunk/reactos/ntoskrnl/cc/fs.c Fri Mar 7 18:38:43 2008 @@ -87,7 +87,12 @@ IN PVOID LazyWriterContext ) { - CcRosInitializeFileCache(FileObject, VACB_MAPPING_GRANULARITY); + ASSERT(FileObject); + ASSERT(FileSizes); + + /* Call old ROS cache init function */ + CcRosInitializeFileCache(FileObject, + PAGE_SIZE/*VACB_MAPPING_GRANULARITY*/); } = /*

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs