Windows Asynchronous purging of file content after a DV change

Purge all regions of the file surrounding the extents which are to be
purged. If a failure occurs on the purge due to an existing mapping, flag
for purge during handle close

Change-Id: Id8ef81afaa614ea08e03bbd55ec2cdded0d7139f
Reviewed-on: http://gerrit.openafs.org/6573
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@secure-endpoints.com>
Tested-by: Jeffrey Altman <jaltman@secure-endpoints.com>

diff --git a/src/WINNT/afsrdr/kernel/lib/AFSCleanup.cpp b/src/WINNT/afsrdr/kernel/lib/AFSCleanup.cpp
index 5f5be0933bb8e94e7d93adba5df4eeaabee7c59b..af8c180366c05600c66f5c76d5d0dcdbbc953c5c 100644 (file)
--- a/src/WINNT/afsrdr/kernel/lib/AFSCleanup.cpp
+++ b/src/WINNT/afsrdr/kernel/lib/AFSCleanup.cpp
@@ -636,6 +636,15 @@ AFSCleanup( IN PDEVICE_OBJECT LibDeviceObject,
 
                 AFSReleaseResource( &pFcb->NPFcb->Resource);
 
+                if( BooleanFlagOn( pFcb->Flags, AFS_FCB_FLAG_PURGE_ON_CLOSE))
+                {
+                    InterlockedIncrement( &pObjectInfo->ObjectReferenceCount);
+                    ClearFlag( pFcb->Flags, AFS_FCB_FLAG_PURGE_ON_CLOSE);
+
+                    AFSPerformObjectInvalidate( pObjectInfo,
+                                                AFS_INVALIDATE_DATA_VERSION);
+                }
+
                 lCount = InterlockedDecrement( &pFcb->OpenHandleCount);
 
                 AFSDbgLogMsg( AFS_SUBSYSTEM_FCB_REF_COUNTING,

diff --git a/src/WINNT/afsrdr/kernel/lib/AFSGeneric.cpp b/src/WINNT/afsrdr/kernel/lib/AFSGeneric.cpp
index ca071ed2a46c9e9fb1f9df17c2bfe5821914760a..59a47e7bc4b5a02ddba3f68811c5da058112fee1 100644 (file)
--- a/src/WINNT/afsrdr/kernel/lib/AFSGeneric.cpp
+++ b/src/WINNT/afsrdr/kernel/lib/AFSGeneric.cpp
@@ -8565,6 +8565,10 @@ AFSPerformObjectInvalidate( IN AFSObjectInfoCB *ObjectInfo,
             case AFS_INVALIDATE_DATA_VERSION:
             {
 
+                LARGE_INTEGER liCurrentOffset = {0,0};
+                LARGE_INTEGER liFlushLength = {0,0};
+                ULONG ulFlushLength = 0;
+
                 if( ObjectInfo->FileType == AFS_FILE_TYPE_FILE &&
                     ObjectInfo->Fcb != NULL)
                 {
@@ -8583,20 +8587,69 @@ AFSPerformObjectInvalidate( IN AFSObjectInfoCB *ObjectInfo,
 
                         ulCount = (ULONG)ObjectInfo->Fcb->Specific.File.ExtentCount;
 
-                        while( ulProcessCount < ulCount)
+                        if( ulCount > 0)
                         {
                             pEntry = ExtentFor( le, AFS_EXTENTS_LIST );
 
-                            if( !BooleanFlagOn( pEntry->Flags, AFS_EXTENT_DIRTY))
+                            while( ulProcessCount < ulCount)
                             {
-                                CcPurgeCacheSection( &ObjectInfo->Fcb->NPFcb->SectionObjectPointers,
-                                                     &pEntry->FileOffset,
-                                                     pEntry->Size,
-                                                     FALSE);
+                                pEntry = ExtentFor( le, AFS_EXTENTS_LIST );
+
+                                if( !BooleanFlagOn( pEntry->Flags, AFS_EXTENT_DIRTY))
+                                {
+                                    if( !CcPurgeCacheSection( &ObjectInfo->Fcb->NPFcb->SectionObjectPointers,
+                                                              &pEntry->FileOffset,
+                                                              pEntry->Size,
+                                                              FALSE))
+                                    {
+                                        SetFlag( ObjectInfo->Fcb->Flags, AFS_FCB_FLAG_PURGE_ON_CLOSE);
+                                    }
+                                }
+
+                                if( liCurrentOffset.QuadPart < pEntry->FileOffset.QuadPart)
+                                {
+
+                                    liFlushLength.QuadPart = pEntry->FileOffset.QuadPart - liCurrentOffset.QuadPart;
+
+                                    while( liFlushLength.QuadPart > 0)
+                                    {
+
+                                        if( liFlushLength.QuadPart > 512 * 1024000)
+                                        {
+                                            ulFlushLength = 512 * 1024000;
+                                        }
+                                        else
+                                        {
+                                            ulFlushLength = liFlushLength.LowPart;
+                                        }
+
+                                        if( !CcPurgeCacheSection( &ObjectInfo->Fcb->NPFcb->SectionObjectPointers,
+                                                                  &liCurrentOffset,
+                                                                  ulFlushLength,
+                                                                  FALSE))
+                                        {
+                                            SetFlag( ObjectInfo->Fcb->Flags, AFS_FCB_FLAG_PURGE_ON_CLOSE);
+                                        }
+
+                                        liFlushLength.QuadPart -= ulFlushLength;
+                                    }
+                                }
+
+                                liCurrentOffset.QuadPart = pEntry->FileOffset.QuadPart + pEntry->Size;
+
+                                ulProcessCount++;
+                                le = le->Flink;
+                            }
+                        }
+                        else
+                        {
+                            if( !CcPurgeCacheSection( &ObjectInfo->Fcb->NPFcb->SectionObjectPointers,
+                                                      NULL,
+                                                      0,
+                                                      FALSE))
+                            {
+                                SetFlag( ObjectInfo->Fcb->Flags, AFS_FCB_FLAG_PURGE_ON_CLOSE);
                             }
-
-                            ulProcessCount++;
-                            le = le->Flink;
                         }
                     }
                     __except( EXCEPTION_EXECUTE_HANDLER)

diff --git a/src/WINNT/afsrdr/kernel/lib/Include/AFSDefines.h b/src/WINNT/afsrdr/kernel/lib/Include/AFSDefines.h
index d7c102e5e8438cfb2af5f827429bd87857e2ccab..c08e6886c616b8bf58c50fe4fae1cbe4af785e2c 100644 (file)
--- a/src/WINNT/afsrdr/kernel/lib/Include/AFSDefines.h
+++ b/src/WINNT/afsrdr/kernel/lib/Include/AFSDefines.h
@@ -136,6 +136,7 @@ NTSTATUS
 #define AFS_FCB_FLAG_UPDATE_ACCESS_TIME                      0x00000010
 #define AFS_FCB_FLAG_UPDATE_CREATE_TIME                      0x00000020
 #define AFS_FCB_FLAG_UPDATE_LAST_WRITE_TIME                  0x00000040
+#define AFS_FCB_FLAG_PURGE_ON_CLOSE                          0x00000080
 
 //
 // Object information flags