From 3cdfdc4792444c54a36341b6a8a66ae1a8085cec Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Fri, 13 Apr 2012 23:16:56 -0400 Subject: [PATCH] Windows: Remove PurgeContent param AFSVerifyEntry When verifying a directory entry we must update the metadata for a file therefore we must also purge the data if the version number changed. This is not optional. Change-Id: Icb673c7a6c52b3778978248fcb243d110685aa8d Reviewed-on: http://gerrit.openafs.org/7208 Tested-by: BuildBot Reviewed-by: Jeffrey Altman Tested-by: Jeffrey Altman --- src/WINNT/afsrdr/kernel/lib/AFSCreate.cpp | 3 --- src/WINNT/afsrdr/kernel/lib/AFSDirControl.cpp | 1 - src/WINNT/afsrdr/kernel/lib/AFSGeneric.cpp | 13 ++++--------- src/WINNT/afsrdr/kernel/lib/Include/AFSCommon.h | 1 - 4 files changed, 4 insertions(+), 14 deletions(-) diff --git a/src/WINNT/afsrdr/kernel/lib/AFSCreate.cpp b/src/WINNT/afsrdr/kernel/lib/AFSCreate.cpp index 6e0e94c5f..def89e98c 100644 --- a/src/WINNT/afsrdr/kernel/lib/AFSCreate.cpp +++ b/src/WINNT/afsrdr/kernel/lib/AFSCreate.cpp @@ -1380,7 +1380,6 @@ AFSOpenRoot( IN PIRP Irp, ntStatus = AFSValidateEntry( VolumeCB->DirectoryCB, AuthGroup, - TRUE, FALSE); if( !NT_SUCCESS( ntStatus)) @@ -2562,7 +2561,6 @@ AFSProcessOpen( IN PIRP Irp, ntStatus = AFSValidateEntry( DirectoryCB, AuthGroup, - TRUE, FALSE); if( !NT_SUCCESS( ntStatus)) @@ -3072,7 +3070,6 @@ AFSProcessOverwriteSupersede( IN PDEVICE_OBJECT DeviceObject, ntStatus = AFSValidateEntry( DirectoryCB, AuthGroup, - TRUE, FALSE); if( !NT_SUCCESS( ntStatus)) diff --git a/src/WINNT/afsrdr/kernel/lib/AFSDirControl.cpp b/src/WINNT/afsrdr/kernel/lib/AFSDirControl.cpp index 82139d1c5..cb8995840 100644 --- a/src/WINNT/afsrdr/kernel/lib/AFSDirControl.cpp +++ b/src/WINNT/afsrdr/kernel/lib/AFSDirControl.cpp @@ -724,7 +724,6 @@ AFSQueryDirectory( IN PIRP Irp) AFSValidateEntry( pDirEntry, &pCcb->AuthGroup, - FALSE, FALSE); pObjectInfo = pDirEntry->ObjectInformation; diff --git a/src/WINNT/afsrdr/kernel/lib/AFSGeneric.cpp b/src/WINNT/afsrdr/kernel/lib/AFSGeneric.cpp index df8879afd..d38387c5a 100644 --- a/src/WINNT/afsrdr/kernel/lib/AFSGeneric.cpp +++ b/src/WINNT/afsrdr/kernel/lib/AFSGeneric.cpp @@ -3716,7 +3716,6 @@ try_exit: NTSTATUS AFSValidateEntry( IN AFSDirectoryCB *DirEntry, IN GUID *AuthGroup, - IN BOOLEAN PurgeContent, IN BOOLEAN FastCall) { @@ -3737,13 +3736,12 @@ AFSValidateEntry( IN AFSDirectoryCB *DirEntry, AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, - "AFSValidateEntry Validating entry %wZ FID %08lX-%08lX-%08lX-%08lX PurgeContent %u FastCall %u\n", + "AFSValidateEntry Validating entry %wZ FID %08lX-%08lX-%08lX-%08lX FastCall %u\n", &DirEntry->NameInformation.FileName, pObjectInfo->FileId.Cell, pObjectInfo->FileId.Volume, pObjectInfo->FileId.Vnode, pObjectInfo->FileId.Unique, - PurgeContent, FastCall); // @@ -3815,8 +3813,7 @@ AFSValidateEntry( IN AFSDirectoryCB *DirEntry, AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, - "AFSValidateEntry Validating entry Purge %d FastCall %d %wZ FID %08lX-%08lX-%08lX-%08lX DV %I64X returned DV %I64X FT %d\n", - PurgeContent, + "AFSValidateEntry Validating entry FastCall %d %wZ FID %08lX-%08lX-%08lX-%08lX DV %I64X returned DV %I64X FT %d\n", FastCall, &DirEntry->NameInformation.FileName, pObjectInfo->FileId.Cell, @@ -3883,10 +3880,9 @@ AFSValidateEntry( IN AFSDirectoryCB *DirEntry, // Can't hold the Fcb resource while doing this // - if( PurgeContent && - pObjectInfo->Fcb != NULL && + if( pObjectInfo->Fcb != NULL && (pObjectInfo->DataVersion.QuadPart != pDirEnumEntry->DataVersion.QuadPart || - BooleanFlagOn( pObjectInfo->Flags, AFS_OBJECT_FLAGS_VERIFY_DATA))) + BooleanFlagOn( pObjectInfo->Flags, AFS_OBJECT_FLAGS_VERIFY_DATA))) { pCurrentFcb = pObjectInfo->Fcb; @@ -4042,7 +4038,6 @@ AFSValidateEntry( IN AFSDirectoryCB *DirEntry, (PCC_FILE_SIZES)&pObjectInfo->Fcb->Header.AllocationSize); } } - break; } diff --git a/src/WINNT/afsrdr/kernel/lib/Include/AFSCommon.h b/src/WINNT/afsrdr/kernel/lib/Include/AFSCommon.h index ab3eb8e7f..f98494e2f 100644 --- a/src/WINNT/afsrdr/kernel/lib/Include/AFSCommon.h +++ b/src/WINNT/afsrdr/kernel/lib/Include/AFSCommon.h @@ -1194,7 +1194,6 @@ AFSUpdateMetaData( IN AFSDirectoryCB *DirEntry, NTSTATUS AFSValidateEntry( IN AFSDirectoryCB *DirEntry, IN GUID *AuthGroup, - IN BOOLEAN PurgeContent, IN BOOLEAN FastCall); AFSDirectoryCB * -- 2.39.5