From d34c276260d595e8b75aa5a31f882e5fe67d7457 Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Sun, 17 Aug 2014 21:47:43 +0000 Subject: [PATCH] [NTOS:CC] - Use the passed-in file sizes in CcInitializeCacheMap svn path=/trunk/; revision=63901 --- reactos/ntoskrnl/cc/fs.c | 1 + reactos/ntoskrnl/cc/view.c | 10 +++------- reactos/ntoskrnl/include/internal/cc.h | 1 + 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/reactos/ntoskrnl/cc/fs.c b/reactos/ntoskrnl/cc/fs.c index 27f6455904c..b4c3b1d0d0d 100644 --- a/reactos/ntoskrnl/cc/fs.c +++ b/reactos/ntoskrnl/cc/fs.c @@ -87,6 +87,7 @@ CcInitializeCacheMap ( /* Call old ROS cache init function */ CcRosInitializeFileCache(FileObject, + FileSizes, CallBacks, LazyWriterContext); } diff --git a/reactos/ntoskrnl/cc/view.c b/reactos/ntoskrnl/cc/view.c index 10bf34cb248..05544f9f69f 100644 --- a/reactos/ntoskrnl/cc/view.c +++ b/reactos/ntoskrnl/cc/view.c @@ -1187,6 +1187,7 @@ NTSTATUS NTAPI CcRosInitializeFileCache ( PFILE_OBJECT FileObject, + PCC_FILE_SIZES FileSizes, PCACHE_MANAGER_CALLBACKS CallBacks, PVOID LazyWriterContext) /* @@ -1216,13 +1217,8 @@ CcRosInitializeFileCache ( SharedCacheMap->FileObject = FileObject; SharedCacheMap->Callbacks = CallBacks; SharedCacheMap->LazyWriteContext = LazyWriterContext; - if (FileObject->FsContext) - { - SharedCacheMap->SectionSize = - ((PFSRTL_COMMON_FCB_HEADER)FileObject->FsContext)->AllocationSize; - SharedCacheMap->FileSize = - ((PFSRTL_COMMON_FCB_HEADER)FileObject->FsContext)->FileSize; - } + SharedCacheMap->SectionSize = FileSizes->AllocationSize; + SharedCacheMap->FileSize = FileSizes->FileSize; KeInitializeSpinLock(&SharedCacheMap->CacheMapLock); InitializeListHead(&SharedCacheMap->CacheMapVacbListHead); FileObject->SectionObjectPointer->SharedCacheMap = SharedCacheMap; diff --git a/reactos/ntoskrnl/include/internal/cc.h b/reactos/ntoskrnl/include/internal/cc.h index 3e559f8888b..30c657d6dbc 100644 --- a/reactos/ntoskrnl/include/internal/cc.h +++ b/reactos/ntoskrnl/include/internal/cc.h @@ -287,6 +287,7 @@ NTSTATUS NTAPI CcRosInitializeFileCache( PFILE_OBJECT FileObject, + PCC_FILE_SIZES FileSizes, PCACHE_MANAGER_CALLBACKS CallBacks, PVOID LazyWriterContext );