[FASTFAT] Uninit directory cache on last handle close.

CORE-14629
CORE-14557

diff --git a/drivers/filesystems/fastfat/close.c b/drivers/filesystems/fastfat/close.c
index 992ccac..bb5cfaa 100644 (file)
--- a/drivers/filesystems/fastfat/close.c
+++ b/drivers/filesystems/fastfat/close.c
@@ -48,6 +48,19 @@ VfatCloseFile(
     }
     else
     {
     }
     else
     {

+        if (pFcb->OpenHandleCount == 0 && BooleanFlagOn(pFcb->Flags, FCB_CACHE_INITIALIZED))
+        {
+            PFILE_OBJECT tmpFileObject;
+            tmpFileObject = pFcb->FileObject;
+            if (tmpFileObject != NULL)
+            {
+                pFcb->FileObject = NULL;
+                CcUninitializeCacheMap(tmpFileObject, NULL, NULL);
+                ClearFlag(pFcb->Flags, FCB_CACHE_INITIALIZED);
+                ObDereferenceObject(tmpFileObject);
+            }
+        }
+

 #ifdef KDBG
         pFcb->Flags |= FCB_CLOSED;
 #endif
 #ifdef KDBG
         pFcb->Flags |= FCB_CLOSED;
 #endif

diff --git a/drivers/filesystems/fastfat/dirwr.c b/drivers/filesystems/fastfat/dirwr.c
index e2026b8..dc073f9 100644 (file)
--- a/drivers/filesystems/fastfat/dirwr.c
+++ b/drivers/filesystems/fastfat/dirwr.c
@@ -37,6 +37,7 @@ vfatFCBInitializeCacheFromVolume(
     }
 
     ASSERT(vfatFCBIsDirectory(fcb));
     }
 
     ASSERT(vfatFCBIsDirectory(fcb));

+    ASSERT(fcb->FileObject == NULL);

 
     Acquired = FALSE;
     if (!ExIsResourceAcquiredExclusive(&vcb->DirResource))
 
     Acquired = FALSE;
     if (!ExIsResourceAcquiredExclusive(&vcb->DirResource))