[NTOS:CC]

- Rename ROS_SHARED_CACHE_MAP::AllocationSize to SectionSize
CORE-8065

svn path=/trunk/; revision=62715

diff --git a/reactos/ntoskrnl/cc/copy.c b/reactos/ntoskrnl/cc/copy.c
index ed1bb8a..7cd5d3d 100644 (file)
--- a/reactos/ntoskrnl/cc/copy.c
+++ b/reactos/ntoskrnl/cc/copy.c
@@ -199,7 +199,7 @@ CcReadVirtualAddress (
     KEVENT Event;
 
     VacbOffset.QuadPart = Vacb->FileOffset;
-    Size = (ULONG)(Vacb->SharedCacheMap->AllocationSize.QuadPart - Vacb->FileOffset);
+    Size = (ULONG)(Vacb->SharedCacheMap->SectionSize.QuadPart - Vacb->FileOffset);
     if (Size > VACB_MAPPING_GRANULARITY)
     {
         Size = VACB_MAPPING_GRANULARITY;
@@ -252,7 +252,7 @@ CcWriteVirtualAddress (
 
     Vacb->Dirty = FALSE;
     VacbOffset.QuadPart = Vacb->FileOffset;
-    Size = (ULONG)(Vacb->SharedCacheMap->AllocationSize.QuadPart - Vacb->FileOffset);
+    Size = (ULONG)(Vacb->SharedCacheMap->SectionSize.QuadPart - Vacb->FileOffset);
     if (Size > VACB_MAPPING_GRANULARITY)
     {
         Size = VACB_MAPPING_GRANULARITY;
@@ -344,8 +344,8 @@ CcCopyRead (
     SharedCacheMap = FileObject->SectionObjectPointer->SharedCacheMap;
     ReadOffset = (ULONG)FileOffset->QuadPart;
 
-    DPRINT("AllocationSize %I64d, FileSize %I64d\n",
-           SharedCacheMap->AllocationSize.QuadPart,
+    DPRINT("SectionSize %I64d, FileSize %I64d\n",
+           SharedCacheMap->SectionSize.QuadPart,
            SharedCacheMap->FileSize.QuadPart);
 
     /*

diff --git a/reactos/ntoskrnl/cc/fs.c b/reactos/ntoskrnl/cc/fs.c
index d806d38..0652891 100644 (file)
--- a/reactos/ntoskrnl/cc/fs.c
+++ b/reactos/ntoskrnl/cc/fs.c
@@ -150,7 +150,7 @@ CcSetFileSizes (
     if (SharedCacheMap == NULL)
         return;
 
-    if (FileSizes->AllocationSize.QuadPart < SharedCacheMap->AllocationSize.QuadPart)
+    if (FileSizes->AllocationSize.QuadPart < SharedCacheMap->SectionSize.QuadPart)
     {
         InitializeListHead(&FreeListHead);
         KeAcquireGuardedMutex(&ViewLock);
@@ -185,7 +185,7 @@ CcSetFileSizes (
             }
         }
 
-        SharedCacheMap->AllocationSize = FileSizes->AllocationSize;
+        SharedCacheMap->SectionSize = FileSizes->AllocationSize;
         SharedCacheMap->FileSize = FileSizes->FileSize;
         KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldirql);
         KeReleaseGuardedMutex(&ViewLock);
@@ -206,7 +206,7 @@ CcSetFileSizes (
     else
     {
         KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &oldirql);
-        SharedCacheMap->AllocationSize = FileSizes->AllocationSize;
+        SharedCacheMap->SectionSize = FileSizes->AllocationSize;
         SharedCacheMap->FileSize = FileSizes->FileSize;
         KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldirql);
     }
@@ -256,7 +256,7 @@ CcGetFileSizes (
     if (!SharedCacheMap)
         return FALSE;
 
-    FileSizes->AllocationSize = SharedCacheMap->AllocationSize;
+    FileSizes->AllocationSize = SharedCacheMap->SectionSize;
     FileSizes->FileSize = FileSizes->ValidDataLength = SharedCacheMap->FileSize;
     return TRUE;
 }

diff --git a/reactos/ntoskrnl/cc/pin.c b/reactos/ntoskrnl/cc/pin.c
index 2ab228a..a439d78 100644 (file)
--- a/reactos/ntoskrnl/cc/pin.c
+++ b/reactos/ntoskrnl/cc/pin.c
@@ -53,8 +53,8 @@ CcMapData (
     SharedCacheMap = FileObject->SectionObjectPointer->SharedCacheMap;
     ASSERT(SharedCacheMap);
 
-    DPRINT("AllocationSize %I64x, FileSize %I64x\n",
-           SharedCacheMap->AllocationSize.QuadPart,
+    DPRINT("SectionSize %I64x, FileSize %I64x\n",
+           SharedCacheMap->SectionSize.QuadPart,
            SharedCacheMap->FileSize.QuadPart);
 
     if (ReadOffset % VACB_MAPPING_GRANULARITY + Length > VACB_MAPPING_GRANULARITY)

diff --git a/reactos/ntoskrnl/cc/view.c b/reactos/ntoskrnl/cc/view.c
index e72eda1..2bce41b 100644 (file)
--- a/reactos/ntoskrnl/cc/view.c
+++ b/reactos/ntoskrnl/cc/view.c
@@ -1220,7 +1220,7 @@ CcRosInitializeFileCache (
         SharedCacheMap->LazyWriteContext = LazyWriterContext;
         if (FileObject->FsContext)
         {
-            SharedCacheMap->AllocationSize =
+            SharedCacheMap->SectionSize =
                 ((PFSRTL_COMMON_FCB_HEADER)FileObject->FsContext)->AllocationSize;
             SharedCacheMap->FileSize =
                 ((PFSRTL_COMMON_FCB_HEADER)FileObject->FsContext)->FileSize;

diff --git a/reactos/ntoskrnl/include/internal/cc.h b/reactos/ntoskrnl/include/internal/cc.h
index a65de29..e781e14 100644 (file)
--- a/reactos/ntoskrnl/include/internal/cc.h
+++ b/reactos/ntoskrnl/include/internal/cc.h
@@ -106,7 +106,7 @@ typedef struct _ROS_SHARED_CACHE_MAP
     LIST_ENTRY CacheMapVacbListHead;
     ULONG TimeStamp;
     PFILE_OBJECT FileObject;
-    LARGE_INTEGER AllocationSize;
+    LARGE_INTEGER SectionSize;
     LARGE_INTEGER FileSize;
     PCACHE_MANAGER_CALLBACKS Callbacks;
     PVOID LazyWriteContext;