[NTOSKRNL] Implement CcIsThereDirtyData()
[reactos.git] / ntoskrnl / cc / view.c
index b55b4ad..0e37b77 100644 (file)
 
 /* GLOBALS *******************************************************************/
 
-/*
- * If CACHE_BITMAP is defined, the cache manager uses one large memory region
- * within the kernel address space and allocate/deallocate space from this block
- * over a bitmap. If CACHE_BITMAP is used, the size of the mdl mapping region
- * must be reduced (ntoskrnl\mm\mdl.c, MI_MDLMAPPING_REGION_SIZE).
- */
-//#define CACHE_BITMAP
-
-static LIST_ENTRY DirtySegmentListHead;
-static LIST_ENTRY CacheSegmentListHead;
-static LIST_ENTRY CacheSegmentLRUListHead;
-static LIST_ENTRY ClosedListHead;
-ULONG DirtyPageCount=0;
+LIST_ENTRY DirtyVacbListHead;
+static LIST_ENTRY VacbLruListHead;
+ULONG DirtyPageCount = 0;
 
 KGUARDED_MUTEX ViewLock;
 
-#ifdef CACHE_BITMAP
-#define        CI_CACHESEG_MAPPING_REGION_SIZE (128*1024*1024)
-
-static PVOID CiCacheSegMappingRegionBase = NULL;
-static RTL_BITMAP CiCacheSegMappingRegionAllocMap;
-static ULONG CiCacheSegMappingRegionHint;
-static KSPIN_LOCK CiCacheSegMappingRegionLock;
-#endif
-
 NPAGED_LOOKASIDE_LIST iBcbLookasideList;
-static NPAGED_LOOKASIDE_LIST BcbLookasideList;
-static NPAGED_LOOKASIDE_LIST CacheSegLookasideList;
+static NPAGED_LOOKASIDE_LIST SharedCacheMapLookasideList;
+static NPAGED_LOOKASIDE_LIST VacbLookasideList;
 
 #if DBG
-static void CcRosCacheSegmentIncRefCount_ ( PCACHE_SEGMENT cs, const char* file, int line )
+static void CcRosVacbIncRefCount_(PROS_VACB vacb, const char* file, int line)
 {
-       ++cs->ReferenceCount;
-       if ( cs->Bcb->Trace )
-       {
-               DbgPrint("(%s:%i) CacheSegment %p ++RefCount=%d, Dirty %d, PageOut %d\n",
-                       file, line, cs, cs->ReferenceCount, cs->Dirty, cs->PageOut );
-       }
+    ++vacb->ReferenceCount;
+    if (vacb->SharedCacheMap->Trace)
+    {
+        DbgPrint("(%s:%i) VACB %p ++RefCount=%lu, Dirty %u, PageOut %lu\n",
+                 file, line, vacb, vacb->ReferenceCount, vacb->Dirty, vacb->PageOut);
+    }
 }
-static void CcRosCacheSegmentDecRefCount_ ( PCACHE_SEGMENT cs, const char* file, int line )
+static void CcRosVacbDecRefCount_(PROS_VACB vacb, const char* file, int line)
 {
-       --cs->ReferenceCount;
-       if ( cs->Bcb->Trace )
-       {
-               DbgPrint("(%s:%i) CacheSegment %p --RefCount=%d, Dirty %d, PageOut %d\n",
-                       file, line, cs, cs->ReferenceCount, cs->Dirty, cs->PageOut );
-       }
+    --vacb->ReferenceCount;
+    if (vacb->SharedCacheMap->Trace)
+    {
+        DbgPrint("(%s:%i) VACB %p --RefCount=%lu, Dirty %u, PageOut %lu\n",
+                 file, line, vacb, vacb->ReferenceCount, vacb->Dirty, vacb->PageOut);
+    }
 }
-#define CcRosCacheSegmentIncRefCount(cs) CcRosCacheSegmentIncRefCount_(cs,__FILE__,__LINE__)
-#define CcRosCacheSegmentDecRefCount(cs) CcRosCacheSegmentDecRefCount_(cs,__FILE__,__LINE__)
+#define CcRosVacbIncRefCount(vacb) CcRosVacbIncRefCount_(vacb,__FILE__,__LINE__)
+#define CcRosVacbDecRefCount(vacb) CcRosVacbDecRefCount_(vacb,__FILE__,__LINE__)
 #else
-#define CcRosCacheSegmentIncRefCount(cs) (++((cs)->ReferenceCount))
-#define CcRosCacheSegmentDecRefCount(cs) (--((cs)->ReferenceCount))
+#define CcRosVacbIncRefCount(vacb) (++((vacb)->ReferenceCount))
+#define CcRosVacbDecRefCount(vacb) (--((vacb)->ReferenceCount))
 #endif
 
 NTSTATUS
-CcRosInternalFreeCacheSegment(PCACHE_SEGMENT CacheSeg);
+CcRosInternalFreeVacb(PROS_VACB Vacb);
 
 
 /* FUNCTIONS *****************************************************************/
@@ -105,125 +86,126 @@ CcRosInternalFreeCacheSegment(PCACHE_SEGMENT CacheSeg);
 VOID
 NTAPI
 CcRosTraceCacheMap (
-       PBCB Bcb,
-       BOOLEAN Trace )
+    PROS_SHARED_CACHE_MAP SharedCacheMap,
+    BOOLEAN Trace )
 {
 #if DBG
-       KIRQL oldirql;
-       PLIST_ENTRY current_entry;
-       PCACHE_SEGMENT current;
-
-       if ( !Bcb )
-               return;
-
-       Bcb->Trace = Trace;
-
-       if ( Trace )
-       {
-               DPRINT1("Enabling Tracing for CacheMap 0x%p:\n", Bcb );
-
-               KeAcquireGuardedMutex(&ViewLock);
-               KeAcquireSpinLock(&Bcb->BcbLock, &oldirql);
-
-               current_entry = Bcb->BcbSegmentListHead.Flink;
-               while (current_entry != &Bcb->BcbSegmentListHead)
-               {
-                       current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, BcbSegmentListEntry);
-                       current_entry = current_entry->Flink;
-
-                       DPRINT1("  CacheSegment 0x%p enabled, RefCount %d, Dirty %d, PageOut %d\n",
-                               current, current->ReferenceCount, current->Dirty, current->PageOut );
-               }
-               KeReleaseSpinLock(&Bcb->BcbLock, oldirql);
-               KeReleaseGuardedMutex(&ViewLock);
-       }
-       else
-       {
-               DPRINT1("Disabling Tracing for CacheMap 0x%p:\n", Bcb );
-       }
+    KIRQL oldirql;
+    PLIST_ENTRY current_entry;
+    PROS_VACB current;
+
+    if (!SharedCacheMap)
+        return;
+
+    SharedCacheMap->Trace = Trace;
+
+    if (Trace)
+    {
+        DPRINT1("Enabling Tracing for CacheMap 0x%p:\n", SharedCacheMap);
+
+        KeAcquireGuardedMutex(&ViewLock);
+        KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &oldirql);
+
+        current_entry = SharedCacheMap->CacheMapVacbListHead.Flink;
+        while (current_entry != &SharedCacheMap->CacheMapVacbListHead)
+        {
+            current = CONTAINING_RECORD(current_entry, ROS_VACB, CacheMapVacbListEntry);
+            current_entry = current_entry->Flink;
+
+            DPRINT1("  VACB 0x%p enabled, RefCount %lu, Dirty %u, PageOut %lu\n",
+                    current, current->ReferenceCount, current->Dirty, current->PageOut );
+        }
+        KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldirql);
+        KeReleaseGuardedMutex(&ViewLock);
+    }
+    else
+    {
+        DPRINT1("Disabling Tracing for CacheMap 0x%p:\n", SharedCacheMap);
+    }
 
 #else
-       Bcb = Bcb;
-       Trace = Trace;
+    UNREFERENCED_PARAMETER(SharedCacheMap);
+    UNREFERENCED_PARAMETER(Trace);
 #endif
 }
 
 NTSTATUS
 NTAPI
-CcRosFlushCacheSegment(PCACHE_SEGMENT CacheSegment)
+CcRosFlushVacb (
+    PROS_VACB Vacb)
 {
     NTSTATUS Status;
     KIRQL oldIrql;
-    
-    Status = WriteCacheSegment(CacheSegment);
+
+    Status = CcWriteVirtualAddress(Vacb);
     if (NT_SUCCESS(Status))
     {
         KeAcquireGuardedMutex(&ViewLock);
-        KeAcquireSpinLock(&CacheSegment->Bcb->BcbLock, &oldIrql);
-        
-        CacheSegment->Dirty = FALSE;
-        RemoveEntryList(&CacheSegment->DirtySegmentListEntry);
-        DirtyPageCount -= CacheSegment->Bcb->CacheSegmentSize / PAGE_SIZE;
-        CcRosCacheSegmentDecRefCount ( CacheSegment );
-        
-        KeReleaseSpinLock(&CacheSegment->Bcb->BcbLock, oldIrql);
+        KeAcquireSpinLock(&Vacb->SharedCacheMap->CacheMapLock, &oldIrql);
+
+        Vacb->Dirty = FALSE;
+        RemoveEntryList(&Vacb->DirtyVacbListEntry);
+        DirtyPageCount -= VACB_MAPPING_GRANULARITY / PAGE_SIZE;
+        CcRosVacbDecRefCount(Vacb);
+
+        KeReleaseSpinLock(&Vacb->SharedCacheMap->CacheMapLock, oldIrql);
         KeReleaseGuardedMutex(&ViewLock);
     }
-    
-    return(Status);
+
+    return Status;
 }
 
 NTSTATUS
 NTAPI
-CcRosFlushDirtyPages(ULONG Target, PULONG Count, BOOLEAN Wait)
+CcRosFlushDirtyPages (
+    ULONG Target,
+    PULONG Count,
+    BOOLEAN Wait)
 {
     PLIST_ENTRY current_entry;
-    PCACHE_SEGMENT current;
-    ULONG PagesPerSegment;
+    PROS_VACB current;
     BOOLEAN Locked;
     NTSTATUS Status;
     LARGE_INTEGER ZeroTimeout;
-    
-    DPRINT("CcRosFlushDirtyPages(Target %d)\n", Target);
-    
+
+    DPRINT("CcRosFlushDirtyPages(Target %lu)\n", Target);
+
     (*Count) = 0;
     ZeroTimeout.QuadPart = 0;
-    
+
     KeEnterCriticalRegion();
     KeAcquireGuardedMutex(&ViewLock);
-    
-    current_entry = DirtySegmentListHead.Flink;
-    if (current_entry == &DirtySegmentListHead)
+
+    current_entry = DirtyVacbListHead.Flink;
+    if (current_entry == &DirtyVacbListHead)
     {
         DPRINT("No Dirty pages\n");
     }
-    
-    while (current_entry != &DirtySegmentListHead && Target > 0)
+
+    while ((current_entry != &DirtyVacbListHead) && (Target > 0))
     {
-        current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT,
-                                    DirtySegmentListEntry);
+        current = CONTAINING_RECORD(current_entry,
+                                    ROS_VACB,
+                                    DirtyVacbListEntry);
         current_entry = current_entry->Flink;
 
-        CcRosCacheSegmentIncRefCount(current);
+        CcRosVacbIncRefCount(current);
 
-        Locked = current->Bcb->Callbacks->AcquireForLazyWrite(
-            current->Bcb->LazyWriteContext, Wait);
+        Locked = current->SharedCacheMap->Callbacks->AcquireForLazyWrite(
+                     current->SharedCacheMap->LazyWriteContext, Wait);
         if (!Locked)
         {
-            CcRosCacheSegmentDecRefCount(current);
+            CcRosVacbDecRefCount(current);
             continue;
         }
 
-        Status = KeWaitForSingleObject(&current->Mutex,
-                                       Executive,
-                                       KernelMode,
-                                       FALSE,
-                                       Wait ? NULL : &ZeroTimeout);
+        Status = CcRosAcquireVacbLock(current,
+                                      Wait ? NULL : &ZeroTimeout);
         if (Status != STATUS_SUCCESS)
         {
-            current->Bcb->Callbacks->ReleaseFromLazyWrite(
-                current->Bcb->LazyWriteContext);
-            CcRosCacheSegmentDecRefCount(current);
+            current->SharedCacheMap->Callbacks->ReleaseFromLazyWrite(
+                current->SharedCacheMap->LazyWriteContext);
+            CcRosVacbDecRefCount(current);
             continue;
         }
 
@@ -232,48 +214,50 @@ CcRosFlushDirtyPages(ULONG Target, PULONG Count, BOOLEAN Wait)
         /* One reference is added above */
         if (current->ReferenceCount > 2)
         {
-            KeReleaseMutex(&current->Mutex, 0);
-            current->Bcb->Callbacks->ReleaseFromLazyWrite(
-                current->Bcb->LazyWriteContext);
-            CcRosCacheSegmentDecRefCount(current);
+            CcRosReleaseVacbLock(current);
+            current->SharedCacheMap->Callbacks->ReleaseFromLazyWrite(
+                current->SharedCacheMap->LazyWriteContext);
+            CcRosVacbDecRefCount(current);
             continue;
         }
 
-        PagesPerSegment = current->Bcb->CacheSegmentSize / PAGE_SIZE;
-
         KeReleaseGuardedMutex(&ViewLock);
 
-        Status = CcRosFlushCacheSegment(current);
+        Status = CcRosFlushVacb(current);
+
+        CcRosReleaseVacbLock(current);
+        current->SharedCacheMap->Callbacks->ReleaseFromLazyWrite(
+            current->SharedCacheMap->LazyWriteContext);
 
-        KeReleaseMutex(&current->Mutex, 0);
-        current->Bcb->Callbacks->ReleaseFromLazyWrite(
-            current->Bcb->LazyWriteContext);
-        
         KeAcquireGuardedMutex(&ViewLock);
-        CcRosCacheSegmentDecRefCount(current);
+        CcRosVacbDecRefCount(current);
 
-        if (!NT_SUCCESS(Status) &&  (Status != STATUS_END_OF_FILE))
+        if (!NT_SUCCESS(Status) && (Status != STATUS_END_OF_FILE) &&
+            (Status != STATUS_MEDIA_WRITE_PROTECTED))
         {
-            DPRINT1("CC: Failed to flush cache segment.\n");
+            DPRINT1("CC: Failed to flush VACB.\n");
         }
         else
         {
-            (*Count) += PagesPerSegment;
-            Target -= PagesPerSegment;
+            (*Count) += VACB_MAPPING_GRANULARITY / PAGE_SIZE;
+            Target -= VACB_MAPPING_GRANULARITY / PAGE_SIZE;
         }
 
-        current_entry = DirtySegmentListHead.Flink;
+        current_entry = DirtyVacbListHead.Flink;
     }
-    
+
     KeReleaseGuardedMutex(&ViewLock);
     KeLeaveCriticalRegion();
-    
+
     DPRINT("CcRosFlushDirtyPages() finished\n");
-    return(STATUS_SUCCESS);
+    return STATUS_SUCCESS;
 }
 
 NTSTATUS
-CcRosTrimCache(ULONG Target, ULONG Priority, PULONG NrFreed)
+CcRosTrimCache (
+    ULONG Target,
+    ULONG Priority,
+    PULONG NrFreed)
 /*
  * FUNCTION: Try to free some memory from the file cache.
  * ARGUMENTS:
@@ -284,8 +268,7 @@ CcRosTrimCache(ULONG Target, ULONG Priority, PULONG NrFreed)
  */
 {
     PLIST_ENTRY current_entry;
-    PCACHE_SEGMENT current;
-    ULONG PagesPerSegment;
+    PROS_VACB current;
     ULONG PagesFreed;
     KIRQL oldIrql;
     LIST_ENTRY FreeList;
@@ -293,7 +276,7 @@ CcRosTrimCache(ULONG Target, ULONG Priority, PULONG NrFreed)
     ULONG i;
     BOOLEAN FlushedPages = FALSE;
 
-    DPRINT("CcRosTrimCache(Target %d)\n", Target);
+    DPRINT("CcRosTrimCache(Target %lu)\n", Target);
 
     InitializeListHead(&FreeList);
 
@@ -302,27 +285,28 @@ CcRosTrimCache(ULONG Target, ULONG Priority, PULONG NrFreed)
 retry:
     KeAcquireGuardedMutex(&ViewLock);
 
-    current_entry = CacheSegmentLRUListHead.Flink;
-    while (current_entry != &CacheSegmentLRUListHead)
+    current_entry = VacbLruListHead.Flink;
+    while (current_entry != &VacbLruListHead)
     {
-        current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT,
-                                    CacheSegmentLRUListEntry);
+        current = CONTAINING_RECORD(current_entry,
+                                    ROS_VACB,
+                                    VacbLruListEntry);
         current_entry = current_entry->Flink;
 
-        KeAcquireSpinLock(&current->Bcb->BcbLock, &oldIrql);
+        KeAcquireSpinLock(&current->SharedCacheMap->CacheMapLock, &oldIrql);
 
-        /* Reference the cache segment */
-        CcRosCacheSegmentIncRefCount(current);
+        /* Reference the VACB */
+        CcRosVacbIncRefCount(current);
 
         /* Check if it's mapped and not dirty */
         if (current->MappedCount > 0 && !current->Dirty)
         {
             /* We have to break these locks because Cc sucks */
-            KeReleaseSpinLock(&current->Bcb->BcbLock, oldIrql);
+            KeReleaseSpinLock(&current->SharedCacheMap->CacheMapLock, oldIrql);
             KeReleaseGuardedMutex(&ViewLock);
 
-            /* Page out the segment */
-            for (i = 0; i < current->Bcb->CacheSegmentSize / PAGE_SIZE; i++)
+            /* Page out the VACB */
+            for (i = 0; i < VACB_MAPPING_GRANULARITY / PAGE_SIZE; i++)
             {
                 Page = (PFN_NUMBER)(MmGetPhysicalAddress((PUCHAR)current->BaseAddress + (i * PAGE_SIZE)).QuadPart >> PAGE_SHIFT);
 
@@ -331,11 +315,11 @@ retry:
 
             /* Reacquire the locks */
             KeAcquireGuardedMutex(&ViewLock);
-            KeAcquireSpinLock(&current->Bcb->BcbLock, &oldIrql);
+            KeAcquireSpinLock(&current->SharedCacheMap->CacheMapLock, &oldIrql);
         }
 
-        /* Dereference the cache segment */
-        CcRosCacheSegmentDecRefCount(current);
+        /* Dereference the VACB */
+        CcRosVacbDecRefCount(current);
 
         /* Check if we can free this entry now */
         if (current->ReferenceCount == 0)
@@ -343,25 +327,23 @@ retry:
             ASSERT(!current->Dirty);
             ASSERT(!current->MappedCount);
 
-            RemoveEntryList(&current->BcbSegmentListEntry);
-            RemoveEntryList(&current->CacheSegmentListEntry);
-            RemoveEntryList(&current->CacheSegmentLRUListEntry);
-            InsertHeadList(&FreeList, &current->BcbSegmentListEntry);
+            RemoveEntryList(&current->CacheMapVacbListEntry);
+            RemoveEntryList(&current->VacbLruListEntry);
+            InsertHeadList(&FreeList, &current->CacheMapVacbListEntry);
 
             /* Calculate how many pages we freed for Mm */
-            PagesPerSegment = current->Bcb->CacheSegmentSize / PAGE_SIZE;
-            PagesFreed = min(PagesPerSegment, Target);
+            PagesFreed = min(VACB_MAPPING_GRANULARITY / PAGE_SIZE, Target);
             Target -= PagesFreed;
             (*NrFreed) += PagesFreed;
         }
 
-        KeReleaseSpinLock(&current->Bcb->BcbLock, oldIrql);
+        KeReleaseSpinLock(&current->SharedCacheMap->CacheMapLock, oldIrql);
     }
 
     KeReleaseGuardedMutex(&ViewLock);
 
     /* Try flushing pages if we haven't met our target */
-    if (Target > 0 && !FlushedPages)
+    if ((Target > 0) && !FlushedPages)
     {
         /* Flush dirty pages to disk */
         CcRosFlushDirtyPages(Target, &PagesFreed, FALSE);
@@ -374,7 +356,7 @@ retry:
         if (PagesFreed != 0)
         {
             /* Try again after flushing dirty pages */
-            DPRINT("Flushed %d dirty cache pages to disk\n", PagesFreed);
+            DPRINT("Flushed %lu dirty cache pages to disk\n", PagesFreed);
             goto retry;
         }
     }
@@ -382,653 +364,572 @@ retry:
     while (!IsListEmpty(&FreeList))
     {
         current_entry = RemoveHeadList(&FreeList);
-        current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT,
-                                    BcbSegmentListEntry);
-        CcRosInternalFreeCacheSegment(current);
+        current = CONTAINING_RECORD(current_entry,
+                                    ROS_VACB,
+                                    CacheMapVacbListEntry);
+        CcRosInternalFreeVacb(current);
     }
 
-    DPRINT("Evicted %d cache pages\n", (*NrFreed));
+    DPRINT("Evicted %lu cache pages\n", (*NrFreed));
 
-    return(STATUS_SUCCESS);
+    return STATUS_SUCCESS;
 }
 
 NTSTATUS
 NTAPI
-CcRosReleaseCacheSegment(PBCB Bcb,
-                        PCACHE_SEGMENT CacheSeg,
-                        BOOLEAN Valid,
-                        BOOLEAN Dirty,
-                        BOOLEAN Mapped)
+CcRosReleaseVacb (
+    PROS_SHARED_CACHE_MAP SharedCacheMap,
+    PROS_VACB Vacb,
+    BOOLEAN Valid,
+    BOOLEAN Dirty,
+    BOOLEAN Mapped)
 {
-  BOOLEAN WasDirty;
-  KIRQL oldIrql;
+    BOOLEAN WasDirty;
+    KIRQL oldIrql;
 
-  ASSERT(Bcb);
+    ASSERT(SharedCacheMap);
 
-  DPRINT("CcReleaseCacheSegment(Bcb 0x%p, CacheSeg 0x%p, Valid %d)\n",
-        Bcb, CacheSeg, Valid);
+    DPRINT("CcRosReleaseVacb(SharedCacheMap 0x%p, Vacb 0x%p, Valid %u)\n",
+           SharedCacheMap, Vacb, Valid);
 
-  KeAcquireGuardedMutex(&ViewLock);
-  KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql);
+    KeAcquireGuardedMutex(&ViewLock);
+    KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &oldIrql);
 
-  CacheSeg->Valid = Valid;
+    Vacb->Valid = Valid;
 
-  WasDirty = CacheSeg->Dirty;
-  CacheSeg->Dirty = CacheSeg->Dirty || Dirty;
+    WasDirty = Vacb->Dirty;
+    Vacb->Dirty = Vacb->Dirty || Dirty;
 
-  if (!WasDirty && CacheSeg->Dirty)
+    if (!WasDirty && Vacb->Dirty)
+    {
+        InsertTailList(&DirtyVacbListHead, &Vacb->DirtyVacbListEntry);
+        DirtyPageCount += VACB_MAPPING_GRANULARITY / PAGE_SIZE;
+    }
+
+    if (Mapped)
+    {
+        Vacb->MappedCount++;
+    }
+    CcRosVacbDecRefCount(Vacb);
+    if (Mapped && (Vacb->MappedCount == 1))
     {
-      InsertTailList(&DirtySegmentListHead, &CacheSeg->DirtySegmentListEntry);
-      DirtyPageCount += Bcb->CacheSegmentSize / PAGE_SIZE;
+        CcRosVacbIncRefCount(Vacb);
     }
+    if (!WasDirty && Vacb->Dirty)
+    {
+        CcRosVacbIncRefCount(Vacb);
+    }
+
+    KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldIrql);
+    KeReleaseGuardedMutex(&ViewLock);
+    CcRosReleaseVacbLock(Vacb);
 
-  if (Mapped)
-  {
-     CacheSeg->MappedCount++;
-  }
-  CcRosCacheSegmentDecRefCount(CacheSeg);
-  if (Mapped && CacheSeg->MappedCount == 1)
-  {
-      CcRosCacheSegmentIncRefCount(CacheSeg);
-  }
-  if (!WasDirty && CacheSeg->Dirty)
-  {
-      CcRosCacheSegmentIncRefCount(CacheSeg);
-  }
-
-  KeReleaseSpinLock(&Bcb->BcbLock, oldIrql);
-  KeReleaseGuardedMutex(&ViewLock);
-  KeReleaseMutex(&CacheSeg->Mutex, 0);
-
-  return(STATUS_SUCCESS);
+    return STATUS_SUCCESS;
 }
 
-/* Returns with Cache Segment Lock Held! */
-PCACHE_SEGMENT
+/* Returns with VACB Lock Held! */
+PROS_VACB
 NTAPI
-CcRosLookupCacheSegment(PBCB Bcb, ULONG FileOffset)
+CcRosLookupVacb (
+    PROS_SHARED_CACHE_MAP SharedCacheMap,
+    LONGLONG FileOffset)
 {
     PLIST_ENTRY current_entry;
-    PCACHE_SEGMENT current;
+    PROS_VACB current;
     KIRQL oldIrql;
-    
-    ASSERT(Bcb);
-    
-    DPRINT("CcRosLookupCacheSegment(Bcb -x%p, FileOffset %d)\n", Bcb, FileOffset);
+
+    ASSERT(SharedCacheMap);
+
+    DPRINT("CcRosLookupVacb(SharedCacheMap 0x%p, FileOffset %I64u)\n",
+           SharedCacheMap, FileOffset);
 
     KeAcquireGuardedMutex(&ViewLock);
-    KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql);
+    KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &oldIrql);
 
-    current_entry = Bcb->BcbSegmentListHead.Flink;
-    while (current_entry != &Bcb->BcbSegmentListHead)
+    current_entry = SharedCacheMap->CacheMapVacbListHead.Flink;
+    while (current_entry != &SharedCacheMap->CacheMapVacbListHead)
     {
-        current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT,
-                                    BcbSegmentListEntry);
-        if (current->FileOffset <= FileOffset &&
-            (current->FileOffset + Bcb->CacheSegmentSize) > FileOffset)
+        current = CONTAINING_RECORD(current_entry,
+                                    ROS_VACB,
+                                    CacheMapVacbListEntry);
+        if (IsPointInRange(current->FileOffset.QuadPart,
+                           VACB_MAPPING_GRANULARITY,
+                           FileOffset))
         {
-            CcRosCacheSegmentIncRefCount(current);
-            KeReleaseSpinLock(&Bcb->BcbLock, oldIrql);
+            CcRosVacbIncRefCount(current);
+            KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldIrql);
             KeReleaseGuardedMutex(&ViewLock);
-            KeWaitForSingleObject(&current->Mutex,
-                                  Executive,
-                                  KernelMode,
-                                  FALSE,
-                                  NULL);
-            return(current);
+            CcRosAcquireVacbLock(current, NULL);
+            return current;
         }
+        if (current->FileOffset.QuadPart > FileOffset)
+            break;
         current_entry = current_entry->Flink;
     }
 
-    KeReleaseSpinLock(&Bcb->BcbLock, oldIrql);
+    KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldIrql);
     KeReleaseGuardedMutex(&ViewLock);
 
-    return(NULL);
+    return NULL;
 }
 
 NTSTATUS
 NTAPI
-CcRosMarkDirtyCacheSegment(PBCB Bcb, ULONG FileOffset)
+CcRosMarkDirtyVacb (
+    PROS_SHARED_CACHE_MAP SharedCacheMap,
+    LONGLONG FileOffset)
 {
-  PCACHE_SEGMENT CacheSeg;
-  KIRQL oldIrql;
+    PROS_VACB Vacb;
+    KIRQL oldIrql;
 
-  ASSERT(Bcb);
+    ASSERT(SharedCacheMap);
 
-  DPRINT("CcRosMarkDirtyCacheSegment(Bcb 0x%p, FileOffset %d)\n", Bcb, FileOffset);
+    DPRINT("CcRosMarkDirtyVacb(SharedCacheMap 0x%p, FileOffset %I64u)\n",
+           SharedCacheMap, FileOffset);
 
-  CacheSeg = CcRosLookupCacheSegment(Bcb, FileOffset);
-  if (CacheSeg == NULL)
+    Vacb = CcRosLookupVacb(SharedCacheMap, FileOffset);
+    if (Vacb == NULL)
     {
-      KeBugCheck(CACHE_MANAGER);
+        KeBugCheck(CACHE_MANAGER);
     }
 
-  KeAcquireGuardedMutex(&ViewLock);
-  KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql);
+    KeAcquireGuardedMutex(&ViewLock);
+    KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &oldIrql);
 
-  if (!CacheSeg->Dirty)
-  {
-      InsertTailList(&DirtySegmentListHead, &CacheSeg->DirtySegmentListEntry);
-      DirtyPageCount += Bcb->CacheSegmentSize / PAGE_SIZE;
-  }
-  else
-  {
-      CcRosCacheSegmentDecRefCount(CacheSeg);
-  }
+    if (!Vacb->Dirty)
+    {
+        InsertTailList(&DirtyVacbListHead, &Vacb->DirtyVacbListEntry);
+        DirtyPageCount += VACB_MAPPING_GRANULARITY / PAGE_SIZE;
+    }
+    else
+    {
+        CcRosVacbDecRefCount(Vacb);
+    }
 
-  /* Move to the tail of the LRU list */
-  RemoveEntryList(&CacheSeg->CacheSegmentLRUListEntry);
-  InsertTailList(&CacheSegmentLRUListHead, &CacheSeg->CacheSegmentLRUListEntry);
+    /* Move to the tail of the LRU list */
+    RemoveEntryList(&Vacb->VacbLruListEntry);
+    InsertTailList(&VacbLruListHead, &Vacb->VacbLruListEntry);
 
-  CacheSeg->Dirty = TRUE;
+    Vacb->Dirty = TRUE;
 
-  KeReleaseSpinLock(&Bcb->BcbLock, oldIrql);
-  KeReleaseGuardedMutex(&ViewLock);
-  KeReleaseMutex(&CacheSeg->Mutex, 0);
+    KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldIrql);
+    KeReleaseGuardedMutex(&ViewLock);
+    CcRosReleaseVacbLock(Vacb);
 
-  return(STATUS_SUCCESS);
+    return STATUS_SUCCESS;
 }
 
 NTSTATUS
 NTAPI
-CcRosUnmapCacheSegment(PBCB Bcb, ULONG FileOffset, BOOLEAN NowDirty)
+CcRosUnmapVacb (
+    PROS_SHARED_CACHE_MAP SharedCacheMap,
+    LONGLONG FileOffset,
+    BOOLEAN NowDirty)
 {
-  PCACHE_SEGMENT CacheSeg;
-  BOOLEAN WasDirty;
-  KIRQL oldIrql;
+    PROS_VACB Vacb;
+    BOOLEAN WasDirty;
+    KIRQL oldIrql;
 
-  ASSERT(Bcb);
+    ASSERT(SharedCacheMap);
 
-  DPRINT("CcRosUnmapCacheSegment(Bcb 0x%p, FileOffset %d, NowDirty %d)\n",
-          Bcb, FileOffset, NowDirty);
+    DPRINT("CcRosUnmapVacb(SharedCacheMap 0x%p, FileOffset %I64u, NowDirty %u)\n",
+           SharedCacheMap, FileOffset, NowDirty);
 
-  CacheSeg = CcRosLookupCacheSegment(Bcb, FileOffset);
-  if (CacheSeg == NULL)
+    Vacb = CcRosLookupVacb(SharedCacheMap, FileOffset);
+    if (Vacb == NULL)
     {
-      return(STATUS_UNSUCCESSFUL);
+        return STATUS_UNSUCCESSFUL;
     }
 
-  KeAcquireGuardedMutex(&ViewLock);
-  KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql);
+    KeAcquireGuardedMutex(&ViewLock);
+    KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &oldIrql);
 
-  WasDirty = CacheSeg->Dirty;
-  CacheSeg->Dirty = CacheSeg->Dirty || NowDirty;
+    WasDirty = Vacb->Dirty;
+    Vacb->Dirty = Vacb->Dirty || NowDirty;
 
-  CacheSeg->MappedCount--;
+    Vacb->MappedCount--;
 
-  if (!WasDirty && NowDirty)
-  {
-     InsertTailList(&DirtySegmentListHead, &CacheSeg->DirtySegmentListEntry);
-     DirtyPageCount += Bcb->CacheSegmentSize / PAGE_SIZE;
-  }
+    if (!WasDirty && NowDirty)
+    {
+        InsertTailList(&DirtyVacbListHead, &Vacb->DirtyVacbListEntry);
+        DirtyPageCount += VACB_MAPPING_GRANULARITY / PAGE_SIZE;
+    }
 
-  CcRosCacheSegmentDecRefCount(CacheSeg);
-  if (!WasDirty && NowDirty)
-  {
-     CcRosCacheSegmentIncRefCount(CacheSeg);
-  }
-  if (CacheSeg->MappedCount == 0)
-  {
-     CcRosCacheSegmentDecRefCount(CacheSeg);
-  }
+    CcRosVacbDecRefCount(Vacb);
+    if (!WasDirty && NowDirty)
+    {
+        CcRosVacbIncRefCount(Vacb);
+    }
+    if (Vacb->MappedCount == 0)
+    {
+        CcRosVacbDecRefCount(Vacb);
+    }
 
-  KeReleaseSpinLock(&Bcb->BcbLock, oldIrql);
-  KeReleaseGuardedMutex(&ViewLock);
-  KeReleaseMutex(&CacheSeg->Mutex, 0);
+    KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldIrql);
+    KeReleaseGuardedMutex(&ViewLock);
+    CcRosReleaseVacbLock(Vacb);
 
-  return(STATUS_SUCCESS);
+    return STATUS_SUCCESS;
 }
 
 static
 NTSTATUS
-CcRosCreateCacheSegment(PBCB Bcb,
-                       ULONG FileOffset,
-                       PCACHE_SEGMENT* CacheSeg)
+CcRosMapVacb(
+    PROS_VACB Vacb)
 {
-  PCACHE_SEGMENT current;
-  PCACHE_SEGMENT previous;
-  PLIST_ENTRY current_entry;
-  NTSTATUS Status;
-  KIRQL oldIrql;
-#ifdef CACHE_BITMAP
-  ULONG StartingOffset;
-#endif
-  PHYSICAL_ADDRESS BoundaryAddressMultiple;
+    ULONG i;
+    NTSTATUS Status;
+    ULONG_PTR NumberOfPages;
+
+    /* Create a memory area. */
+    MmLockAddressSpace(MmGetKernelAddressSpace());
+    Status = MmCreateMemoryArea(MmGetKernelAddressSpace(),
+                                0, // nothing checks for VACB mareas, so set to 0
+                                &Vacb->BaseAddress,
+                                VACB_MAPPING_GRANULARITY,
+                                PAGE_READWRITE,
+                                (PMEMORY_AREA*)&Vacb->MemoryArea,
+                                0,
+                                PAGE_SIZE);
+    MmUnlockAddressSpace(MmGetKernelAddressSpace());
+    if (!NT_SUCCESS(Status))
+    {
+        DPRINT1("MmCreateMemoryArea failed with %lx for VACB %p\n", Status, Vacb);
+        return Status;
+    }
+
+    ASSERT(((ULONG_PTR)Vacb->BaseAddress % PAGE_SIZE) == 0);
+    ASSERT((ULONG_PTR)Vacb->BaseAddress > (ULONG_PTR)MmSystemRangeStart);
+
+    /* Create a virtual mapping for this memory area */
+    NumberOfPages = BYTES_TO_PAGES(VACB_MAPPING_GRANULARITY);
+    for (i = 0; i < NumberOfPages; i++)
+    {
+        PFN_NUMBER PageFrameNumber;
+
+        MI_SET_USAGE(MI_USAGE_CACHE);
+        Status = MmRequestPageMemoryConsumer(MC_CACHE, TRUE, &PageFrameNumber);
+        if (PageFrameNumber == 0)
+        {
+            DPRINT1("Unable to allocate page\n");
+            KeBugCheck(MEMORY_MANAGEMENT);
+        }
+
+        Status = MmCreateVirtualMapping(NULL,
+                                        (PVOID)((ULONG_PTR)Vacb->BaseAddress + (i * PAGE_SIZE)),
+                                        PAGE_READWRITE,
+                                        &PageFrameNumber,
+                                        1);
+        if (!NT_SUCCESS(Status))
+        {
+            DPRINT1("Unable to create virtual mapping\n");
+            KeBugCheck(MEMORY_MANAGEMENT);
+        }
+    }
+
+    return STATUS_SUCCESS;
+}
+
+static
+NTSTATUS
+CcRosCreateVacb (
+    PROS_SHARED_CACHE_MAP SharedCacheMap,
+    LONGLONG FileOffset,
+    PROS_VACB *Vacb)
+{
+    PROS_VACB current;
+    PROS_VACB previous;
+    PLIST_ENTRY current_entry;
+    NTSTATUS Status;
+    KIRQL oldIrql;
 
-  ASSERT(Bcb);
+    ASSERT(SharedCacheMap);
 
-  DPRINT("CcRosCreateCacheSegment()\n");
+    DPRINT("CcRosCreateVacb()\n");
 
-  BoundaryAddressMultiple.QuadPart = 0;
-  if (FileOffset >= Bcb->FileSize.u.LowPart)
-  {
-     CacheSeg = NULL;
-     return STATUS_INVALID_PARAMETER;
-  }
+    if (FileOffset >= SharedCacheMap->SectionSize.QuadPart)
+    {
+        *Vacb = NULL;
+        return STATUS_INVALID_PARAMETER;
+    }
 
-  current = ExAllocateFromNPagedLookasideList(&CacheSegLookasideList);
-  current->Valid = FALSE;
-  current->Dirty = FALSE;
-  current->PageOut = FALSE;
-  current->FileOffset = ROUND_DOWN(FileOffset, Bcb->CacheSegmentSize);
-  current->Bcb = Bcb;
+    current = ExAllocateFromNPagedLookasideList(&VacbLookasideList);
+    current->BaseAddress = NULL;
+    current->Valid = FALSE;
+    current->Dirty = FALSE;
+    current->PageOut = FALSE;
+    current->FileOffset.QuadPart = ROUND_DOWN(FileOffset, VACB_MAPPING_GRANULARITY);
+    current->SharedCacheMap = SharedCacheMap;
 #if DBG
-  if ( Bcb->Trace )
-  {
-    DPRINT1("CacheMap 0x%p: new Cache Segment: 0x%p\n", Bcb, current );
-  }
+    if (SharedCacheMap->Trace)
+    {
+        DPRINT1("CacheMap 0x%p: new VACB: 0x%p\n", SharedCacheMap, current);
+    }
 #endif
-  current->MappedCount = 0;
-  current->DirtySegmentListEntry.Flink = NULL;
-  current->DirtySegmentListEntry.Blink = NULL;
-  current->ReferenceCount = 1;
-  KeInitializeMutex(&current->Mutex, 0);
-  KeWaitForSingleObject(&current->Mutex,
-                        Executive,
-                        KernelMode,
-                        FALSE,
-                        NULL);
-  KeAcquireGuardedMutex(&ViewLock);
-
-  *CacheSeg = current;
-  /* There is window between the call to CcRosLookupCacheSegment
-   * and CcRosCreateCacheSegment. We must check if a segment on
-   * the fileoffset exist. If there exist a segment, we release
-   * our new created segment and return the existing one.
-   */
-  KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql);
-  current_entry = Bcb->BcbSegmentListHead.Flink;
-  previous = NULL;
-  while (current_entry != &Bcb->BcbSegmentListHead)
-  {
-     current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT,
-                                BcbSegmentListEntry);
-     if (current->FileOffset <= FileOffset &&
-       (current->FileOffset + Bcb->CacheSegmentSize) > FileOffset)
-     {
-       CcRosCacheSegmentIncRefCount(current);
-       KeReleaseSpinLock(&Bcb->BcbLock, oldIrql);
+    current->MappedCount = 0;
+    current->DirtyVacbListEntry.Flink = NULL;
+    current->DirtyVacbListEntry.Blink = NULL;
+    current->ReferenceCount = 1;
+    current->PinCount = 0;
+    KeInitializeMutex(&current->Mutex, 0);
+    CcRosAcquireVacbLock(current, NULL);
+    KeAcquireGuardedMutex(&ViewLock);
+
+    *Vacb = current;
+    /* There is window between the call to CcRosLookupVacb
+     * and CcRosCreateVacb. We must check if a VACB for the
+     * file offset exist. If there is a VACB, we release
+     * our newly created VACB and return the existing one.
+     */
+    KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &oldIrql);
+    current_entry = SharedCacheMap->CacheMapVacbListHead.Flink;
+    previous = NULL;
+    while (current_entry != &SharedCacheMap->CacheMapVacbListHead)
+    {
+        current = CONTAINING_RECORD(current_entry,
+                                    ROS_VACB,
+                                    CacheMapVacbListEntry);
+        if (IsPointInRange(current->FileOffset.QuadPart,
+                           VACB_MAPPING_GRANULARITY,
+                           FileOffset))
+        {
+            CcRosVacbIncRefCount(current);
+            KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldIrql);
 #if DBG
-       if ( Bcb->Trace )
-       {
-               DPRINT1("CacheMap 0x%p: deleting newly created Cache Segment 0x%p ( found existing one 0x%p )\n",
-                       Bcb,
-                       (*CacheSeg),
-                       current );
-       }
-#endif
-       KeReleaseMutex(&(*CacheSeg)->Mutex, 0);
-       KeReleaseGuardedMutex(&ViewLock);
-       ExFreeToNPagedLookasideList(&CacheSegLookasideList, *CacheSeg);
-       *CacheSeg = current;
-    KeWaitForSingleObject(&current->Mutex,
-                          Executive,
-                          KernelMode,
-                          FALSE,
-                          NULL);
-       return STATUS_SUCCESS;
-     }
-     if (current->FileOffset < FileOffset)
-     {
-        if (previous == NULL)
-       {
-          previous = current;
-       }
-       else
-       {
-          if (previous->FileOffset < current->FileOffset)
-          {
-             previous = current;
-          }
-       }
-     }
-     current_entry = current_entry->Flink;
-  }
-  /* There was no existing segment. */
-  current = *CacheSeg;
-  if (previous)
-  {
-     InsertHeadList(&previous->BcbSegmentListEntry, &current->BcbSegmentListEntry);
-  }
-  else
-  {
-     InsertHeadList(&Bcb->BcbSegmentListHead, &current->BcbSegmentListEntry);
-  }
-  KeReleaseSpinLock(&Bcb->BcbLock, oldIrql);
-  InsertTailList(&CacheSegmentListHead, &current->CacheSegmentListEntry);
-  InsertTailList(&CacheSegmentLRUListHead, &current->CacheSegmentLRUListEntry);
-  KeReleaseGuardedMutex(&ViewLock);
-#ifdef CACHE_BITMAP
-  KeAcquireSpinLock(&CiCacheSegMappingRegionLock, &oldIrql);
-
-  StartingOffset = RtlFindClearBitsAndSet(&CiCacheSegMappingRegionAllocMap, Bcb->CacheSegmentSize / PAGE_SIZE, CiCacheSegMappingRegionHint);
-
-  if (StartingOffset == 0xffffffff)
-  {
-     DPRINT1("Out of CacheSeg mapping space\n");
-     KeBugCheck(CACHE_MANAGER);
-  }
-
-  current->BaseAddress = CiCacheSegMappingRegionBase + StartingOffset * PAGE_SIZE;
-
-  if (CiCacheSegMappingRegionHint == StartingOffset)
-  {
-     CiCacheSegMappingRegionHint += Bcb->CacheSegmentSize / PAGE_SIZE;
-  }
-
-  KeReleaseSpinLock(&CiCacheSegMappingRegionLock, oldIrql);
-#else
-  MmLockAddressSpace(MmGetKernelAddressSpace());
-  current->BaseAddress = NULL;
-  Status = MmCreateMemoryArea(MmGetKernelAddressSpace(),
-                             0, // nothing checks for cache_segment mareas, so set to 0
-                             &current->BaseAddress,
-                             Bcb->CacheSegmentSize,
-                             PAGE_READWRITE,
-                             (PMEMORY_AREA*)&current->MemoryArea,
-                             FALSE,
-                             0,
-                             BoundaryAddressMultiple);
-  MmUnlockAddressSpace(MmGetKernelAddressSpace());
-  if (!NT_SUCCESS(Status))
-  {
-     KeBugCheck(CACHE_MANAGER);
-  }
+            if (SharedCacheMap->Trace)
+            {
+                DPRINT1("CacheMap 0x%p: deleting newly created VACB 0x%p ( found existing one 0x%p )\n",
+                        SharedCacheMap,
+                        (*Vacb),
+                        current);
+            }
 #endif
+            CcRosReleaseVacbLock(*Vacb);
+            KeReleaseGuardedMutex(&ViewLock);
+            ExFreeToNPagedLookasideList(&VacbLookasideList, *Vacb);
+            *Vacb = current;
+            CcRosAcquireVacbLock(current, NULL);
+            return STATUS_SUCCESS;
+        }
+        if (current->FileOffset.QuadPart < FileOffset)
+        {
+            ASSERT(previous == NULL ||
+                   previous->FileOffset.QuadPart < current->FileOffset.QuadPart);
+            previous = current;
+        }
+        if (current->FileOffset.QuadPart > FileOffset)
+            break;
+        current_entry = current_entry->Flink;
+    }
+    /* There was no existing VACB. */
+    current = *Vacb;
+    if (previous)
+    {
+        InsertHeadList(&previous->CacheMapVacbListEntry, &current->CacheMapVacbListEntry);
+    }
+    else
+    {
+        InsertHeadList(&SharedCacheMap->CacheMapVacbListHead, &current->CacheMapVacbListEntry);
+    }
+    KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldIrql);
+    InsertTailList(&VacbLruListHead, &current->VacbLruListEntry);
+    KeReleaseGuardedMutex(&ViewLock);
 
-  /* Create a virtual mapping for this memory area */
-  MI_SET_USAGE(MI_USAGE_CACHE);
+    MI_SET_USAGE(MI_USAGE_CACHE);
 #if MI_TRACE_PFNS
-  PWCHAR pos = NULL;
-  ULONG len = 0;
-  if ((Bcb->FileObject) && (Bcb->FileObject->FileName.Buffer))
-  {
-    pos = wcsrchr(Bcb->FileObject->FileName.Buffer, '\\');
-    len = wcslen(pos) * sizeof(WCHAR);
-    if (pos) snprintf(MI_PFN_CURRENT_PROCESS_NAME, min(16, len), "%S", pos);
-  }   
+    if ((SharedCacheMap->FileObject) && (SharedCacheMap->FileObject->FileName.Buffer))
+    {
+        PWCHAR pos = NULL;
+        ULONG len = 0;
+        pos = wcsrchr(SharedCacheMap->FileObject->FileName.Buffer, '\\');
+        if (pos)
+        {
+            len = wcslen(pos) * sizeof(WCHAR);
+            snprintf(MI_PFN_CURRENT_PROCESS_NAME, min(16, len), "%S", pos);
+        }
+        else
+        {
+            snprintf(MI_PFN_CURRENT_PROCESS_NAME, min(16, len), "%wZ", &SharedCacheMap->FileObject->FileName);
+        }
+    }
 #endif
 
-  MmMapMemoryArea(current->BaseAddress, Bcb->CacheSegmentSize,
-      MC_CACHE, PAGE_READWRITE);
+    Status = CcRosMapVacb(current);
+    if (!NT_SUCCESS(Status))
+    {
+        RemoveEntryList(&current->CacheMapVacbListEntry);
+        RemoveEntryList(&current->VacbLruListEntry);
+        CcRosReleaseVacbLock(current);
+        ExFreeToNPagedLookasideList(&VacbLookasideList, current);
+    }
 
-  return(STATUS_SUCCESS);
+    return Status;
 }
 
 NTSTATUS
 NTAPI
-CcRosGetCacheSegmentChain(PBCB Bcb,
-                         ULONG FileOffset,
-                         ULONG Length,
-                         PCACHE_SEGMENT* CacheSeg)
+CcRosGetVacb (
+    PROS_SHARED_CACHE_MAP SharedCacheMap,
+    LONGLONG FileOffset,
+    PLONGLONG BaseOffset,
+    PVOID* BaseAddress,
+    PBOOLEAN UptoDate,
+    PROS_VACB *Vacb)
 {
-  PCACHE_SEGMENT current;
-  ULONG i;
-  PCACHE_SEGMENT* CacheSegList;
-  PCACHE_SEGMENT Previous = NULL;
-
-  ASSERT(Bcb);
-
-  DPRINT("CcRosGetCacheSegmentChain()\n");
+    PROS_VACB current;
+    NTSTATUS Status;
 
-  Length = ROUND_UP(Length, Bcb->CacheSegmentSize);
+    ASSERT(SharedCacheMap);
 
-  CacheSegList = _alloca(sizeof(PCACHE_SEGMENT) *
-                       (Length / Bcb->CacheSegmentSize));
+    DPRINT("CcRosGetVacb()\n");
 
-  /*
-   * Look for a cache segment already mapping the same data.
-   */
-  for (i = 0; i < (Length / Bcb->CacheSegmentSize); i++)
+    /*
+     * Look for a VACB already mapping the same data.
+     */
+    current = CcRosLookupVacb(SharedCacheMap, FileOffset);
+    if (current == NULL)
     {
-      ULONG CurrentOffset = FileOffset + (i * Bcb->CacheSegmentSize);
-      current = CcRosLookupCacheSegment(Bcb, CurrentOffset);
-      if (current != NULL)
-       {
-         KeAcquireGuardedMutex(&ViewLock);
-
-         /* Move to tail of LRU list */
-         RemoveEntryList(&current->CacheSegmentLRUListEntry);
-         InsertTailList(&CacheSegmentLRUListHead, &current->CacheSegmentLRUListEntry);
-
-         KeReleaseGuardedMutex(&ViewLock);
-
-         CacheSegList[i] = current;
-       }
-      else
-       {
-         CcRosCreateCacheSegment(Bcb, CurrentOffset, &current);
-         CacheSegList[i] = current;
-       }
+        /*
+         * Otherwise create a new VACB.
+         */
+        Status = CcRosCreateVacb(SharedCacheMap, FileOffset, &current);
+        if (!NT_SUCCESS(Status))
+        {
+            return Status;
+        }
     }
 
-  for (i = 0; i < (Length / Bcb->CacheSegmentSize); i++)
-    {
-      if (i == 0)
-       {
-         *CacheSeg = CacheSegList[i];
-         Previous = CacheSegList[i];
-       }
-      else
-       {
-         Previous->NextInChain = CacheSegList[i];
-         Previous = CacheSegList[i];
-       }
-    }
-  ASSERT(Previous);
-  Previous->NextInChain = NULL;
+    KeAcquireGuardedMutex(&ViewLock);
 
-  return(STATUS_SUCCESS);
+    /* Move to the tail of the LRU list */
+    RemoveEntryList(&current->VacbLruListEntry);
+    InsertTailList(&VacbLruListHead, &current->VacbLruListEntry);
+
+    KeReleaseGuardedMutex(&ViewLock);
+
+    /*
+     * Return information about the VACB to the caller.
+     */
+    *UptoDate = current->Valid;
+    *BaseAddress = current->BaseAddress;
+    DPRINT("*BaseAddress %p\n", *BaseAddress);
+    *Vacb = current;
+    *BaseOffset = current->FileOffset.QuadPart;
+    return STATUS_SUCCESS;
 }
 
 NTSTATUS
 NTAPI
-CcRosGetCacheSegment(PBCB Bcb,
-                    ULONG FileOffset,
-                    PULONG BaseOffset,
-                    PVOID* BaseAddress,
-                    PBOOLEAN UptoDate,
-                    PCACHE_SEGMENT* CacheSeg)
-{
-   PCACHE_SEGMENT current;
-   NTSTATUS Status;
-
-   ASSERT(Bcb);
-
-   DPRINT("CcRosGetCacheSegment()\n");
-
-   /*
-    * Look for a cache segment already mapping the same data.
-    */
-   current = CcRosLookupCacheSegment(Bcb, FileOffset);
-   if (current == NULL)
-   {
-     /*
-      * Otherwise create a new segment.
-      */
-      Status = CcRosCreateCacheSegment(Bcb, FileOffset, &current);
-      if (!NT_SUCCESS(Status))
-      {
-       return Status;
-      }
-   }
-
-   KeAcquireGuardedMutex(&ViewLock);
-
-   /* Move to the tail of the LRU list */
-   RemoveEntryList(&current->CacheSegmentLRUListEntry);
-   InsertTailList(&CacheSegmentLRUListHead, &current->CacheSegmentLRUListEntry);
-
-   KeReleaseGuardedMutex(&ViewLock);
-
-   /*
-    * Return information about the segment to the caller.
-    */
-   *UptoDate = current->Valid;
-   *BaseAddress = current->BaseAddress;
-   DPRINT("*BaseAddress %p\n", *BaseAddress);
-   *CacheSeg = current;
-   *BaseOffset = current->FileOffset;
-   return(STATUS_SUCCESS);
-}
-
-NTSTATUS NTAPI
-CcRosRequestCacheSegment(PBCB Bcb,
-                     ULONG FileOffset,
-                     PVOID* BaseAddress,
-                     PBOOLEAN UptoDate,
-                     PCACHE_SEGMENT* CacheSeg)
+CcRosRequestVacb (
+    PROS_SHARED_CACHE_MAP SharedCacheMap,
+    LONGLONG FileOffset,
+    PVOID* BaseAddress,
+    PBOOLEAN UptoDate,
+    PROS_VACB *Vacb)
 /*
- * FUNCTION: Request a page mapping for a BCB
+ * FUNCTION: Request a page mapping for a shared cache map
  */
 {
-  ULONG BaseOffset;
+    LONGLONG BaseOffset;
 
-  ASSERT(Bcb);
+    ASSERT(SharedCacheMap);
 
-  if ((FileOffset % Bcb->CacheSegmentSize) != 0)
+    if (FileOffset % VACB_MAPPING_GRANULARITY != 0)
     {
-      DPRINT1("Bad fileoffset %x should be multiple of %x",
-        FileOffset, Bcb->CacheSegmentSize);
-      KeBugCheck(CACHE_MANAGER);
+        DPRINT1("Bad fileoffset %I64x should be multiple of %x",
+                FileOffset, VACB_MAPPING_GRANULARITY);
+        KeBugCheck(CACHE_MANAGER);
     }
 
-  return(CcRosGetCacheSegment(Bcb,
-                          FileOffset,
-                          &BaseOffset,
-                          BaseAddress,
-                          UptoDate,
-                          CacheSeg));
+    return CcRosGetVacb(SharedCacheMap,
+                        FileOffset,
+                        &BaseOffset,
+                        BaseAddress,
+                        UptoDate,
+                        Vacb);
 }
-#ifdef CACHE_BITMAP
-#else
-static VOID
-CcFreeCachePage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address,
-               PFN_NUMBER Page, SWAPENTRY SwapEntry, BOOLEAN Dirty)
+
+static
+VOID
+CcFreeCachePage (
+    PVOID Context,
+    MEMORY_AREA* MemoryArea,
+    PVOID Address,
+    PFN_NUMBER Page,
+    SWAPENTRY SwapEntry,
+    BOOLEAN Dirty)
 {
-  ASSERT(SwapEntry == 0);
-  if (Page != 0)
+    ASSERT(SwapEntry == 0);
+    if (Page != 0)
     {
         ASSERT(MmGetReferenceCountPage(Page) == 1);
-      MmReleasePageMemoryConsumer(MC_CACHE, Page);
+        MmReleasePageMemoryConsumer(MC_CACHE, Page);
     }
 }
-#endif
+
 NTSTATUS
-CcRosInternalFreeCacheSegment(PCACHE_SEGMENT CacheSeg)
+CcRosInternalFreeVacb (
+    PROS_VACB Vacb)
 /*
- * FUNCTION: Releases a cache segment associated with a BCB
+ * FUNCTION: Releases a VACB associated with a shared cache map
  */
 {
-#ifdef CACHE_BITMAP
-  ULONG i;
-  ULONG RegionSize;
-  ULONG Base;
-  PFN_NUMBER Page;
-  KIRQL oldIrql;
-#endif
-  DPRINT("Freeing cache segment 0x%p\n", CacheSeg);
+    DPRINT("Freeing VACB 0x%p\n", Vacb);
 #if DBG
-       if ( CacheSeg->Bcb->Trace )
-       {
-               DPRINT1("CacheMap 0x%p: deleting Cache Segment: 0x%p\n", CacheSeg->Bcb, CacheSeg );
-       }
-#endif
-#ifdef CACHE_BITMAP
-  RegionSize = CacheSeg->Bcb->CacheSegmentSize / PAGE_SIZE;
-
-  /* Unmap all the pages. */
-  for (i = 0; i < RegionSize; i++)
+    if (Vacb->SharedCacheMap->Trace)
     {
-      MmDeleteVirtualMapping(NULL,
-                            CacheSeg->BaseAddress + (i * PAGE_SIZE),
-                            FALSE,
-                            NULL,
-                            &Page);
-      MmReleasePageMemoryConsumer(MC_CACHE, Page);
+        DPRINT1("CacheMap 0x%p: deleting VACB: 0x%p\n", Vacb->SharedCacheMap, Vacb);
     }
-
-  KeAcquireSpinLock(&CiCacheSegMappingRegionLock, &oldIrql);
-  /* Deallocate all the pages used. */
-  Base = (ULONG)(CacheSeg->BaseAddress - CiCacheSegMappingRegionBase) / PAGE_SIZE;
-
-  RtlClearBits(&CiCacheSegMappingRegionAllocMap, Base, RegionSize);
-
-  CiCacheSegMappingRegionHint = min (CiCacheSegMappingRegionHint, Base);
-
-  KeReleaseSpinLock(&CiCacheSegMappingRegionLock, oldIrql);
-#else
-  MmLockAddressSpace(MmGetKernelAddressSpace());
-  MmFreeMemoryArea(MmGetKernelAddressSpace(),
-                  CacheSeg->MemoryArea,
-                  CcFreeCachePage,
-                  NULL);
-  MmUnlockAddressSpace(MmGetKernelAddressSpace());
 #endif
-  ExFreeToNPagedLookasideList(&CacheSegLookasideList, CacheSeg);
-  return(STATUS_SUCCESS);
-}
 
-NTSTATUS
-NTAPI
-CcRosFreeCacheSegment(PBCB Bcb, PCACHE_SEGMENT CacheSeg)
-{
-  NTSTATUS Status;
-  KIRQL oldIrql;
-
-  ASSERT(Bcb);
-
-  DPRINT("CcRosFreeCacheSegment(Bcb 0x%p, CacheSeg 0x%p)\n",
-         Bcb, CacheSeg);
-
-  KeAcquireGuardedMutex(&ViewLock);
-  KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql);
-  RemoveEntryList(&CacheSeg->BcbSegmentListEntry);
-  RemoveEntryList(&CacheSeg->CacheSegmentListEntry);
-  RemoveEntryList(&CacheSeg->CacheSegmentLRUListEntry);
-  if (CacheSeg->Dirty)
-  {
-     RemoveEntryList(&CacheSeg->DirtySegmentListEntry);
-     DirtyPageCount -= Bcb->CacheSegmentSize / PAGE_SIZE;
-
-  }
-  KeReleaseSpinLock(&Bcb->BcbLock, oldIrql);
-  KeReleaseGuardedMutex(&ViewLock);
-
-  Status = CcRosInternalFreeCacheSegment(CacheSeg);
-  return(Status);
+    MmLockAddressSpace(MmGetKernelAddressSpace());
+    MmFreeMemoryArea(MmGetKernelAddressSpace(),
+                     Vacb->MemoryArea,
+                     CcFreeCachePage,
+                     NULL);
+    MmUnlockAddressSpace(MmGetKernelAddressSpace());
+
+    ExFreeToNPagedLookasideList(&VacbLookasideList, Vacb);
+    return STATUS_SUCCESS;
 }
 
 /*
  * @implemented
  */
-VOID NTAPI
-CcFlushCache(IN PSECTION_OBJECT_POINTERS SectionObjectPointers,
-             IN PLARGE_INTEGER FileOffset OPTIONAL,
-             IN ULONG Length,
-             OUT PIO_STATUS_BLOCK IoStatus)
+VOID
+NTAPI
+CcFlushCache (
+    IN PSECTION_OBJECT_POINTERS SectionObjectPointers,
+    IN PLARGE_INTEGER FileOffset OPTIONAL,
+    IN ULONG Length,
+    OUT PIO_STATUS_BLOCK IoStatus)
 {
-    PBCB Bcb;
+    PROS_SHARED_CACHE_MAP SharedCacheMap;
     LARGE_INTEGER Offset;
-    PCACHE_SEGMENT current;
+    LONGLONG RemainingLength;
+    PROS_VACB current;
     NTSTATUS Status;
     KIRQL oldIrql;
 
-    DPRINT("CcFlushCache(SectionObjectPointers 0x%p, FileOffset 0x%p, Length %d, IoStatus 0x%p)\n",
+    CCTRACE(CC_API_DEBUG, "SectionObjectPointers=%p FileOffset=%p Length=%lu\n",
+        SectionObjectPointers, FileOffset, Length);
+
+    DPRINT("CcFlushCache(SectionObjectPointers 0x%p, FileOffset 0x%p, Length %lu, IoStatus 0x%p)\n",
            SectionObjectPointers, FileOffset, Length, IoStatus);
 
     if (SectionObjectPointers && SectionObjectPointers->SharedCacheMap)
     {
-        Bcb = (PBCB)SectionObjectPointers->SharedCacheMap;
-        ASSERT(Bcb);
+        SharedCacheMap = SectionObjectPointers->SharedCacheMap;
+        ASSERT(SharedCacheMap);
         if (FileOffset)
         {
             Offset = *FileOffset;
+            RemainingLength = Length;
         }
         else
         {
-            Offset.QuadPart = (LONGLONG)0;
-            Length = Bcb->FileSize.u.LowPart;
+            Offset.QuadPart = 0;
+            RemainingLength = SharedCacheMap->FileSize.QuadPart;
         }
 
         if (IoStatus)
@@ -1037,37 +938,31 @@ CcFlushCache(IN PSECTION_OBJECT_POINTERS SectionObjectPointers,
             IoStatus->Information = 0;
         }
 
-        while (Length > 0)
+        while (RemainingLength > 0)
         {
-            current = CcRosLookupCacheSegment (Bcb, Offset.u.LowPart);
+            current = CcRosLookupVacb(SharedCacheMap, Offset.QuadPart);
             if (current != NULL)
             {
                 if (current->Dirty)
                 {
-                    Status = CcRosFlushCacheSegment(current);
+                    Status = CcRosFlushVacb(current);
                     if (!NT_SUCCESS(Status) && IoStatus != NULL)
                     {
                         IoStatus->Status = Status;
                     }
                 }
-                KeReleaseMutex(&current->Mutex, 0);
-                
+
+                CcRosReleaseVacbLock(current);
+
                 KeAcquireGuardedMutex(&ViewLock);
-                KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql);
-                CcRosCacheSegmentDecRefCount(current);
-                KeReleaseSpinLock(&Bcb->BcbLock, oldIrql);
+                KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &oldIrql);
+                CcRosVacbDecRefCount(current);
+                KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldIrql);
                 KeReleaseGuardedMutex(&ViewLock);
             }
 
-            Offset.QuadPart += Bcb->CacheSegmentSize;
-            if (Length > Bcb->CacheSegmentSize)
-            {
-                Length -= Bcb->CacheSegmentSize;
-            }
-            else
-            {
-                Length = 0;
-            }
+            Offset.QuadPart += VACB_MAPPING_GRANULARITY;
+            RemainingLength -= min(RemainingLength, VACB_MAPPING_GRANULARITY);
         }
     }
     else
@@ -1081,364 +976,295 @@ CcFlushCache(IN PSECTION_OBJECT_POINTERS SectionObjectPointers,
 
 NTSTATUS
 NTAPI
-CcRosDeleteFileCache(PFILE_OBJECT FileObject, PBCB Bcb)
+CcRosDeleteFileCache (
+    PFILE_OBJECT FileObject,
+    PROS_SHARED_CACHE_MAP SharedCacheMap)
 /*
- * FUNCTION: Releases the BCB associated with a file object
+ * FUNCTION: Releases the shared cache map associated with a file object
  */
 {
     PLIST_ENTRY current_entry;
-    PCACHE_SEGMENT current;
+    PROS_VACB current;
     LIST_ENTRY FreeList;
     KIRQL oldIrql;
 
-    ASSERT(Bcb);
+    ASSERT(SharedCacheMap);
 
-    Bcb->RefCount++;
+    SharedCacheMap->OpenCount++;
     KeReleaseGuardedMutex(&ViewLock);
 
     CcFlushCache(FileObject->SectionObjectPointer, NULL, 0, NULL);
 
     KeAcquireGuardedMutex(&ViewLock);
-    Bcb->RefCount--;
-    if (Bcb->RefCount == 0)
+    SharedCacheMap->OpenCount--;
+    if (SharedCacheMap->OpenCount == 0)
     {
-        if (Bcb->BcbRemoveListEntry.Flink != NULL)
-        {
-            RemoveEntryList(&Bcb->BcbRemoveListEntry);
-            Bcb->BcbRemoveListEntry.Flink = NULL;
-        }
-
         FileObject->SectionObjectPointer->SharedCacheMap = NULL;
 
         /*
-         * Release all cache segments.
+         * Release all VACBs
          */
         InitializeListHead(&FreeList);
-        KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql);
-        current_entry = Bcb->BcbSegmentListHead.Flink;
-        while (!IsListEmpty(&Bcb->BcbSegmentListHead))
+        KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &oldIrql);
+        while (!IsListEmpty(&SharedCacheMap->CacheMapVacbListHead))
         {
-            current_entry = RemoveTailList(&Bcb->BcbSegmentListHead);
-            current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, BcbSegmentListEntry);
-            RemoveEntryList(&current->CacheSegmentListEntry);
-            RemoveEntryList(&current->CacheSegmentLRUListEntry);
+            current_entry = RemoveTailList(&SharedCacheMap->CacheMapVacbListHead);
+            current = CONTAINING_RECORD(current_entry, ROS_VACB, CacheMapVacbListEntry);
+            RemoveEntryList(&current->VacbLruListEntry);
             if (current->Dirty)
             {
-                RemoveEntryList(&current->DirtySegmentListEntry);
-                DirtyPageCount -= Bcb->CacheSegmentSize / PAGE_SIZE;
-                DPRINT1("Freeing dirty segment\n");
+                RemoveEntryList(&current->DirtyVacbListEntry);
+                DirtyPageCount -= VACB_MAPPING_GRANULARITY / PAGE_SIZE;
+                DPRINT1("Freeing dirty VACB\n");
             }
-            InsertHeadList(&FreeList, &current->BcbSegmentListEntry);
+            InsertHeadList(&FreeList, &current->CacheMapVacbListEntry);
         }
 #if DBG
-        Bcb->Trace = FALSE;
+        SharedCacheMap->Trace = FALSE;
 #endif
-        KeReleaseSpinLock(&Bcb->BcbLock, oldIrql);
+        KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldIrql);
 
         KeReleaseGuardedMutex(&ViewLock);
-        ObDereferenceObject (Bcb->FileObject);
+        ObDereferenceObject(SharedCacheMap->FileObject);
 
         while (!IsListEmpty(&FreeList))
         {
             current_entry = RemoveTailList(&FreeList);
-            current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, BcbSegmentListEntry);
-            CcRosInternalFreeCacheSegment(current);
+            current = CONTAINING_RECORD(current_entry, ROS_VACB, CacheMapVacbListEntry);
+            CcRosInternalFreeVacb(current);
         }
-        ExFreeToNPagedLookasideList(&BcbLookasideList, Bcb);
+        ExFreeToNPagedLookasideList(&SharedCacheMapLookasideList, SharedCacheMap);
         KeAcquireGuardedMutex(&ViewLock);
     }
-    return(STATUS_SUCCESS);
+    return STATUS_SUCCESS;
 }
 
 VOID
 NTAPI
-CcRosReferenceCache(PFILE_OBJECT FileObject)
+CcRosReferenceCache (
+    PFILE_OBJECT FileObject)
 {
-  PBCB Bcb;
-  KeAcquireGuardedMutex(&ViewLock);
-  Bcb = (PBCB)FileObject->SectionObjectPointer->SharedCacheMap;
-  ASSERT(Bcb);
-  if (Bcb->RefCount == 0)
-  {
-     ASSERT(Bcb->BcbRemoveListEntry.Flink != NULL);
-     RemoveEntryList(&Bcb->BcbRemoveListEntry);
-     Bcb->BcbRemoveListEntry.Flink = NULL;
-
-  }
-  else
-  {
-     ASSERT(Bcb->BcbRemoveListEntry.Flink == NULL);
-  }
-  Bcb->RefCount++;
-  KeReleaseGuardedMutex(&ViewLock);
+    PROS_SHARED_CACHE_MAP SharedCacheMap;
+    KeAcquireGuardedMutex(&ViewLock);
+    SharedCacheMap = FileObject->SectionObjectPointer->SharedCacheMap;
+    ASSERT(SharedCacheMap);
+    ASSERT(SharedCacheMap->OpenCount != 0);
+    SharedCacheMap->OpenCount++;
+    KeReleaseGuardedMutex(&ViewLock);
 }
 
 VOID
 NTAPI
-CcRosSetRemoveOnClose(PSECTION_OBJECT_POINTERS SectionObjectPointer)
+CcRosRemoveIfClosed (
+    PSECTION_OBJECT_POINTERS SectionObjectPointer)
 {
-  PBCB Bcb;
-  DPRINT("CcRosSetRemoveOnClose()\n");
-  KeAcquireGuardedMutex(&ViewLock);
-  Bcb = (PBCB)SectionObjectPointer->SharedCacheMap;
-  if (Bcb)
-  {
-    Bcb->RemoveOnClose = TRUE;
-    if (Bcb->RefCount == 0)
+    PROS_SHARED_CACHE_MAP SharedCacheMap;
+    DPRINT("CcRosRemoveIfClosed()\n");
+    KeAcquireGuardedMutex(&ViewLock);
+    SharedCacheMap = SectionObjectPointer->SharedCacheMap;
+    if (SharedCacheMap && SharedCacheMap->OpenCount == 0)
     {
-      CcRosDeleteFileCache(Bcb->FileObject, Bcb);
+        CcRosDeleteFileCache(SharedCacheMap->FileObject, SharedCacheMap);
     }
-  }
-  KeReleaseGuardedMutex(&ViewLock);
+    KeReleaseGuardedMutex(&ViewLock);
 }
 
 
 VOID
 NTAPI
-CcRosDereferenceCache(PFILE_OBJECT FileObject)
+CcRosDereferenceCache (
+    PFILE_OBJECT FileObject)
 {
-  PBCB Bcb;
-  KeAcquireGuardedMutex(&ViewLock);
-  Bcb = (PBCB)FileObject->SectionObjectPointer->SharedCacheMap;
-  ASSERT(Bcb);
-  if (Bcb->RefCount > 0)
-  {
-    Bcb->RefCount--;
-    if (Bcb->RefCount == 0)
+    PROS_SHARED_CACHE_MAP SharedCacheMap;
+    KeAcquireGuardedMutex(&ViewLock);
+    SharedCacheMap = FileObject->SectionObjectPointer->SharedCacheMap;
+    ASSERT(SharedCacheMap);
+    if (SharedCacheMap->OpenCount > 0)
     {
-       MmFreeSectionSegments(Bcb->FileObject);
-          CcRosDeleteFileCache(FileObject, Bcb);
+        SharedCacheMap->OpenCount--;
+        if (SharedCacheMap->OpenCount == 0)
+        {
+            MmFreeSectionSegments(SharedCacheMap->FileObject);
+            CcRosDeleteFileCache(FileObject, SharedCacheMap);
+        }
     }
-  }
-  KeReleaseGuardedMutex(&ViewLock);
+    KeReleaseGuardedMutex(&ViewLock);
 }
 
-NTSTATUS NTAPI
-CcRosReleaseFileCache(PFILE_OBJECT FileObject)
+NTSTATUS
+NTAPI
+CcRosReleaseFileCache (
+    PFILE_OBJECT FileObject)
 /*
  * FUNCTION: Called by the file system when a handle to a file object
  * has been closed.
  */
 {
-  PBCB Bcb;
+    PROS_SHARED_CACHE_MAP SharedCacheMap;
 
-  KeAcquireGuardedMutex(&ViewLock);
+    KeAcquireGuardedMutex(&ViewLock);
 
-  if (FileObject->SectionObjectPointer->SharedCacheMap != NULL)
-  {
-    Bcb = FileObject->SectionObjectPointer->SharedCacheMap;
-    if (FileObject->PrivateCacheMap != NULL)
+    if (FileObject->SectionObjectPointer->SharedCacheMap != NULL)
     {
-      FileObject->PrivateCacheMap = NULL;
-      if (Bcb->RefCount > 0)
-      {
-         Bcb->RefCount--;
-        if (Bcb->RefCount == 0)
-        {
-            MmFreeSectionSegments(Bcb->FileObject);
-              CcRosDeleteFileCache(FileObject, Bcb);
-        }
-      }
+        SharedCacheMap = FileObject->SectionObjectPointer->SharedCacheMap;
+        if (FileObject->PrivateCacheMap != NULL)
+        {
+            FileObject->PrivateCacheMap = NULL;
+            if (SharedCacheMap->OpenCount > 0)
+            {
+                SharedCacheMap->OpenCount--;
+                if (SharedCacheMap->OpenCount == 0)
+                {
+                    MmFreeSectionSegments(SharedCacheMap->FileObject);
+                    CcRosDeleteFileCache(FileObject, SharedCacheMap);
+                }
+            }
+        }
     }
-  }
-  KeReleaseGuardedMutex(&ViewLock);
-  return(STATUS_SUCCESS);
+    KeReleaseGuardedMutex(&ViewLock);
+    return STATUS_SUCCESS;
 }
 
 NTSTATUS
 NTAPI
-CcTryToInitializeFileCache(PFILE_OBJECT FileObject)
+CcTryToInitializeFileCache (
+    PFILE_OBJECT FileObject)
 {
-   PBCB Bcb;
-   NTSTATUS Status;
-
-   KeAcquireGuardedMutex(&ViewLock);
-
-   ASSERT(FileObject->SectionObjectPointer);
-   Bcb = FileObject->SectionObjectPointer->SharedCacheMap;
-   if (Bcb == NULL)
-   {
-      Status = STATUS_UNSUCCESSFUL;
-   }
-   else
-   {
-      if (FileObject->PrivateCacheMap == NULL)
-      {
-         FileObject->PrivateCacheMap = Bcb;
-         Bcb->RefCount++;
-      }
-      if (Bcb->BcbRemoveListEntry.Flink != NULL)
-      {
-         RemoveEntryList(&Bcb->BcbRemoveListEntry);
-         Bcb->BcbRemoveListEntry.Flink = NULL;
-      }
-      Status = STATUS_SUCCESS;
-   }
-   KeReleaseGuardedMutex(&ViewLock);
-
-   return Status;
+    PROS_SHARED_CACHE_MAP SharedCacheMap;
+    NTSTATUS Status;
+
+    KeAcquireGuardedMutex(&ViewLock);
+
+    ASSERT(FileObject->SectionObjectPointer);
+    SharedCacheMap = FileObject->SectionObjectPointer->SharedCacheMap;
+    if (SharedCacheMap == NULL)
+    {
+        Status = STATUS_UNSUCCESSFUL;
+    }
+    else
+    {
+        if (FileObject->PrivateCacheMap == NULL)
+        {
+            FileObject->PrivateCacheMap = SharedCacheMap;
+            SharedCacheMap->OpenCount++;
+        }
+        Status = STATUS_SUCCESS;
+    }
+    KeReleaseGuardedMutex(&ViewLock);
+
+    return Status;
 }
 
 
-NTSTATUS NTAPI
-CcRosInitializeFileCache(PFILE_OBJECT FileObject,
-                         ULONG CacheSegmentSize,
-                         PCACHE_MANAGER_CALLBACKS CallBacks,
-                         PVOID LazyWriterContext)
+NTSTATUS
+NTAPI
+CcRosInitializeFileCache (
+    PFILE_OBJECT FileObject,
+    PCC_FILE_SIZES FileSizes,
+    BOOLEAN PinAccess,
+    PCACHE_MANAGER_CALLBACKS CallBacks,
+    PVOID LazyWriterContext)
 /*
- * FUNCTION: Initializes a BCB for a file object
+ * FUNCTION: Initializes a shared cache map for a file object
  */
 {
-   PBCB Bcb;
-
-   Bcb = FileObject->SectionObjectPointer->SharedCacheMap;
-   DPRINT("CcRosInitializeFileCache(FileObject 0x%p, Bcb 0x%p, CacheSegmentSize %d)\n",
-           FileObject, Bcb, CacheSegmentSize);
-
-   KeAcquireGuardedMutex(&ViewLock);
-   if (Bcb == NULL)
-   {
-       Bcb = ExAllocateFromNPagedLookasideList(&BcbLookasideList);
-       if (Bcb == NULL)
-       {
-           KeReleaseGuardedMutex(&ViewLock);
-           return(STATUS_UNSUCCESSFUL);
-       }
-       memset(Bcb, 0, sizeof(BCB));
-       ObReferenceObjectByPointer(FileObject,
-           FILE_ALL_ACCESS,
-           NULL,
-           KernelMode);
-       Bcb->FileObject = FileObject;
-       Bcb->CacheSegmentSize = CacheSegmentSize;
-       Bcb->Callbacks = CallBacks;
-       Bcb->LazyWriteContext = LazyWriterContext;
-       if (FileObject->FsContext)
-       {
-           Bcb->AllocationSize =
-               ((PFSRTL_COMMON_FCB_HEADER)FileObject->FsContext)->AllocationSize;
-           Bcb->FileSize =
-               ((PFSRTL_COMMON_FCB_HEADER)FileObject->FsContext)->FileSize;
-       }
-       KeInitializeSpinLock(&Bcb->BcbLock);
-       InitializeListHead(&Bcb->BcbSegmentListHead);
-       FileObject->SectionObjectPointer->SharedCacheMap = Bcb;
-   }
-   if (FileObject->PrivateCacheMap == NULL)
-   {
-       FileObject->PrivateCacheMap = Bcb;
-       Bcb->RefCount++;
-   }
-   if (Bcb->BcbRemoveListEntry.Flink != NULL)
-   {
-       RemoveEntryList(&Bcb->BcbRemoveListEntry);
-       Bcb->BcbRemoveListEntry.Flink = NULL;
-   }
-   KeReleaseGuardedMutex(&ViewLock);
-
-   return(STATUS_SUCCESS);
+    PROS_SHARED_CACHE_MAP SharedCacheMap;
+
+    SharedCacheMap = FileObject->SectionObjectPointer->SharedCacheMap;
+    DPRINT("CcRosInitializeFileCache(FileObject 0x%p, SharedCacheMap 0x%p)\n",
+           FileObject, SharedCacheMap);
+
+    KeAcquireGuardedMutex(&ViewLock);
+    if (SharedCacheMap == NULL)
+    {
+        SharedCacheMap = ExAllocateFromNPagedLookasideList(&SharedCacheMapLookasideList);
+        if (SharedCacheMap == NULL)
+        {
+            KeReleaseGuardedMutex(&ViewLock);
+            return STATUS_INSUFFICIENT_RESOURCES;
+        }
+        RtlZeroMemory(SharedCacheMap, sizeof(*SharedCacheMap));
+        ObReferenceObjectByPointer(FileObject,
+                                   FILE_ALL_ACCESS,
+                                   NULL,
+                                   KernelMode);
+        SharedCacheMap->FileObject = FileObject;
+        SharedCacheMap->Callbacks = CallBacks;
+        SharedCacheMap->LazyWriteContext = LazyWriterContext;
+        SharedCacheMap->SectionSize = FileSizes->AllocationSize;
+        SharedCacheMap->FileSize = FileSizes->FileSize;
+        SharedCacheMap->PinAccess = PinAccess;
+        KeInitializeSpinLock(&SharedCacheMap->CacheMapLock);
+        InitializeListHead(&SharedCacheMap->CacheMapVacbListHead);
+        FileObject->SectionObjectPointer->SharedCacheMap = SharedCacheMap;
+    }
+    if (FileObject->PrivateCacheMap == NULL)
+    {
+        FileObject->PrivateCacheMap = SharedCacheMap;
+        SharedCacheMap->OpenCount++;
+    }
+    KeReleaseGuardedMutex(&ViewLock);
+
+    return STATUS_SUCCESS;
 }
 
 /*
  * @implemented
  */
-PFILE_OBJECT NTAPI
-CcGetFileObjectFromSectionPtrs(IN PSECTION_OBJECT_POINTERS SectionObjectPointers)
+PFILE_OBJECT
+NTAPI
+CcGetFileObjectFromSectionPtrs (
+    IN PSECTION_OBJECT_POINTERS SectionObjectPointers)
 {
-   PBCB Bcb;
-   if (SectionObjectPointers && SectionObjectPointers->SharedCacheMap)
-   {
-      Bcb = (PBCB)SectionObjectPointers->SharedCacheMap;
-      ASSERT(Bcb);
-      return Bcb->FileObject;
-   }
-   return NULL;
+    PROS_SHARED_CACHE_MAP SharedCacheMap;
+
+    CCTRACE(CC_API_DEBUG, "SectionObjectPointers=%p\n", SectionObjectPointers);
+
+    if (SectionObjectPointers && SectionObjectPointers->SharedCacheMap)
+    {
+        SharedCacheMap = SectionObjectPointers->SharedCacheMap;
+        ASSERT(SharedCacheMap);
+        return SharedCacheMap->FileObject;
+    }
+    return NULL;
 }
 
 VOID
 INIT_FUNCTION
 NTAPI
-CcInitView(VOID)
+CcInitView (
+    VOID)
 {
-#ifdef CACHE_BITMAP
-  PMEMORY_AREA marea;
-  PVOID Buffer;
-  PHYSICAL_ADDRESS BoundaryAddressMultiple;
-#endif
-
-  DPRINT("CcInitView()\n");
-#ifdef CACHE_BITMAP
-  BoundaryAddressMultiple.QuadPart = 0;
-  CiCacheSegMappingRegionHint = 0;
-  CiCacheSegMappingRegionBase = NULL;
-
-  MmLockAddressSpace(MmGetKernelAddressSpace());
-
-  Status = MmCreateMemoryArea(MmGetKernelAddressSpace(),
-                             MEMORY_AREA_CACHE_SEGMENT,
-                             &CiCacheSegMappingRegionBase,
-                             CI_CACHESEG_MAPPING_REGION_SIZE,
-                             PAGE_READWRITE,
-                             &marea,
-                             FALSE,
-                             0,
-                             BoundaryAddressMultiple);
-  MmUnlockAddressSpace(MmGetKernelAddressSpace());
-  if (!NT_SUCCESS(Status))
-    {
-      KeBugCheck(CACHE_MANAGER);
-    }
-
-  Buffer = ExAllocatePool(NonPagedPool, CI_CACHESEG_MAPPING_REGION_SIZE / (PAGE_SIZE * 8));
-  if (!Buffer)
-  {
-    KeBugCheck(CACHE_MANAGER);
-  }
-
-  RtlInitializeBitMap(&CiCacheSegMappingRegionAllocMap, Buffer, CI_CACHESEG_MAPPING_REGION_SIZE / PAGE_SIZE);
-  RtlClearAllBits(&CiCacheSegMappingRegionAllocMap);
-
-  KeInitializeSpinLock(&CiCacheSegMappingRegionLock);
-#endif
-  InitializeListHead(&CacheSegmentListHead);
-  InitializeListHead(&DirtySegmentListHead);
-  InitializeListHead(&CacheSegmentLRUListHead);
-  InitializeListHead(&ClosedListHead);
-  KeInitializeGuardedMutex(&ViewLock);
-  ExInitializeNPagedLookasideList (&iBcbLookasideList,
-                                  NULL,
-                                  NULL,
-                                  0,
-                                  sizeof(INTERNAL_BCB),
-                                  TAG_IBCB,
-                                  20);
-  ExInitializeNPagedLookasideList (&BcbLookasideList,
-                                  NULL,
-                                  NULL,
-                                  0,
-                                  sizeof(BCB),
-                                  TAG_BCB,
-                                  20);
-  ExInitializeNPagedLookasideList (&CacheSegLookasideList,
-                                  NULL,
-                                  NULL,
-                                  0,
-                                  sizeof(CACHE_SEGMENT),
-                                  TAG_CSEG,
-                                  20);
-
-  MmInitializeMemoryConsumer(MC_CACHE, CcRosTrimCache);
-
-  CcInitCacheZeroPage();
-
+    DPRINT("CcInitView()\n");
+
+    InitializeListHead(&DirtyVacbListHead);
+    InitializeListHead(&VacbLruListHead);
+    KeInitializeGuardedMutex(&ViewLock);
+    ExInitializeNPagedLookasideList(&iBcbLookasideList,
+                                    NULL,
+                                    NULL,
+                                    0,
+                                    sizeof(INTERNAL_BCB),
+                                    TAG_BCB,
+                                    20);
+    ExInitializeNPagedLookasideList(&SharedCacheMapLookasideList,
+                                    NULL,
+                                    NULL,
+                                    0,
+                                    sizeof(ROS_SHARED_CACHE_MAP),
+                                    TAG_SHARED_CACHE_MAP,
+                                    20);
+    ExInitializeNPagedLookasideList(&VacbLookasideList,
+                                    NULL,
+                                    NULL,
+                                    0,
+                                    sizeof(ROS_VACB),
+                                    TAG_VACB,
+                                    20);
+
+    MmInitializeMemoryConsumer(MC_CACHE, CcRosTrimCache);
+
+    CcInitCacheZeroPage();
 }
 
 /* EOF */
-
-
-
-
-
-
-
-