[NTOS:CC]

- Remove useless list entry from ROS_VACB

svn path=/trunk/; revision=63734

diff --git a/reactos/ntoskrnl/cc/fs.c b/reactos/ntoskrnl/cc/fs.c
index 2b95fb1..27f6455 100644 (file)
--- a/reactos/ntoskrnl/cc/fs.c
+++ b/reactos/ntoskrnl/cc/fs.c
@@ -168,7 +168,6 @@ CcSetFileSizes (
                 if ((current->ReferenceCount == 0) || ((current->ReferenceCount == 1) && current->Dirty))
                 {
                     RemoveEntryList(&current->CacheMapVacbListEntry);
                 if ((current->ReferenceCount == 0) || ((current->ReferenceCount == 1) && current->Dirty))
                 {
                     RemoveEntryList(&current->CacheMapVacbListEntry);

-                    RemoveEntryList(&current->VacbListEntry);

                     RemoveEntryList(&current->VacbLruListEntry);
                     if (current->Dirty)
                     {
                     RemoveEntryList(&current->VacbLruListEntry);
                     if (current->Dirty)
                     {

diff --git a/reactos/ntoskrnl/cc/view.c b/reactos/ntoskrnl/cc/view.c
index 0584917..10bf34c 100644 (file)
--- a/reactos/ntoskrnl/cc/view.c
+++ b/reactos/ntoskrnl/cc/view.c
@@ -42,7 +42,6 @@
 /* GLOBALS *******************************************************************/
 
 static LIST_ENTRY DirtyVacbListHead;
 /* GLOBALS *******************************************************************/
 
 static LIST_ENTRY DirtyVacbListHead;

-static LIST_ENTRY VacbListHead;

 static LIST_ENTRY VacbLruListHead;
 ULONG DirtyPageCount = 0;
 
 static LIST_ENTRY VacbLruListHead;
 ULONG DirtyPageCount = 0;
 


@@ -331,7 +330,6 @@ retry:
             ASSERT(!current->MappedCount);
 
             RemoveEntryList(&current->CacheMapVacbListEntry);
             ASSERT(!current->MappedCount);
 
             RemoveEntryList(&current->CacheMapVacbListEntry);

-            RemoveEntryList(&current->VacbListEntry);

             RemoveEntryList(&current->VacbLruListEntry);
             InsertHeadList(&FreeList, &current->CacheMapVacbListEntry);
 
             RemoveEntryList(&current->VacbLruListEntry);
             InsertHeadList(&FreeList, &current->CacheMapVacbListEntry);
 


@@ -688,7 +686,6 @@ CcRosCreateVacb (
         InsertHeadList(&SharedCacheMap->CacheMapVacbListHead, &current->CacheMapVacbListEntry);
     }
     KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldIrql);
         InsertHeadList(&SharedCacheMap->CacheMapVacbListHead, &current->CacheMapVacbListEntry);
     }
     KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldIrql);

-    InsertTailList(&VacbListHead, &current->VacbListEntry);

     InsertTailList(&VacbLruListHead, &current->VacbLruListEntry);
     KeReleaseGuardedMutex(&ViewLock);
 
     InsertTailList(&VacbLruListHead, &current->VacbLruListEntry);
     KeReleaseGuardedMutex(&ViewLock);
 


@@ -1040,7 +1037,6 @@ CcRosDeleteFileCache (
         {
             current_entry = RemoveTailList(&SharedCacheMap->CacheMapVacbListHead);
             current = CONTAINING_RECORD(current_entry, ROS_VACB, CacheMapVacbListEntry);
         {
             current_entry = RemoveTailList(&SharedCacheMap->CacheMapVacbListHead);
             current = CONTAINING_RECORD(current_entry, ROS_VACB, CacheMapVacbListEntry);

-            RemoveEntryList(&current->VacbListEntry);

             RemoveEntryList(&current->VacbLruListEntry);
             if (current->Dirty)
             {
             RemoveEntryList(&current->VacbLruListEntry);
             if (current->Dirty)
             {


@@ -1267,7 +1263,6 @@ CcInitView (
 {
     DPRINT("CcInitView()\n");
 
 {
     DPRINT("CcInitView()\n");
 

-    InitializeListHead(&VacbListHead);

     InitializeListHead(&DirtyVacbListHead);
     InitializeListHead(&VacbLruListHead);
     KeInitializeGuardedMutex(&ViewLock);
     InitializeListHead(&DirtyVacbListHead);
     InitializeListHead(&VacbLruListHead);
     KeInitializeGuardedMutex(&ViewLock);

diff --git a/reactos/ntoskrnl/include/internal/cc.h b/reactos/ntoskrnl/include/internal/cc.h
index 57649de..3e559f8 100644 (file)
--- a/reactos/ntoskrnl/include/internal/cc.h
+++ b/reactos/ntoskrnl/include/internal/cc.h
@@ -135,7 +135,6 @@ typedef struct _ROS_VACB
     /* Entry in the list of VACBs which are dirty. */
     LIST_ENTRY DirtyVacbListEntry;
     /* Entry in the list of VACBs. */
     /* Entry in the list of VACBs which are dirty. */
     LIST_ENTRY DirtyVacbListEntry;
     /* Entry in the list of VACBs. */

-    LIST_ENTRY VacbListEntry;

     LIST_ENTRY VacbLruListEntry;
     /* Offset in the file which this view maps. */
     LARGE_INTEGER FileOffset;
     LIST_ENTRY VacbLruListEntry;
     /* Offset in the file which this view maps. */
     LARGE_INTEGER FileOffset;