Windows: AFSInvalidateObject can overwrite input param
[openafs.git] / src / WINNT / afsrdr / kernel / lib / AFSCommSupport.cpp
index b8ca97d..9afcdf9 100644 (file)
@@ -60,6 +60,8 @@ AFSEnumerateDirectory( IN GUID *AuthGroup,
     __Enter
     {
 
+        ASSERT( ExIsResourceAcquiredExclusiveLite( ObjectInfoCB->Specific.Directory.DirectoryNodeHdr.TreeLock));
+
         uniGUID.Length = 0;
         uniGUID.MaximumLength = 0;
         uniGUID.Buffer = NULL;
@@ -125,18 +127,31 @@ AFSEnumerateDirectory( IN GUID *AuthGroup,
         {
 
             //
-            // Go and retrieve the directory contents
+            // If the enumeration handle is -1 then we are done
             //
 
-            ntStatus = AFSProcessRequest( AFS_REQUEST_TYPE_DIR_ENUM,
-                                          ulRequestFlags,
-                                          AuthGroup,
-                                          NULL,
-                                          &ObjectInfoCB->FileId,
-                                          (void *)pDirQueryCB,
-                                          sizeof( AFSDirQueryCB),
-                                          pBuffer,
-                                          &ulResultLen);
+            if( ((ULONG)-1) == pDirQueryCB->EnumHandle )
+            {
+
+                ntStatus = STATUS_NO_MORE_ENTRIES;
+            }
+            else
+            {
+
+                //
+                // Go and retrieve the directory contents
+                //
+
+                ntStatus = AFSProcessRequest( AFS_REQUEST_TYPE_DIR_ENUM,
+                                              ulRequestFlags,
+                                              AuthGroup,
+                                              NULL,
+                                              &ObjectInfoCB->FileId,
+                                              (void *)pDirQueryCB,
+                                              sizeof( AFSDirQueryCB),
+                                              pBuffer,
+                                              &ulResultLen);
+            }
 
             if( ntStatus != STATUS_SUCCESS ||
                 ulResultLen == 0)
@@ -147,13 +162,56 @@ AFSEnumerateDirectory( IN GUID *AuthGroup,
                 {
 
                     ntStatus = STATUS_SUCCESS;
+
+                    pDirEnumResponse = (AFSDirEnumResp *)pBuffer;
+
+                    AFSAcquireExcl( ObjectInfoCB->Specific.Directory.DirectoryNodeHdr.TreeLock,
+                                    TRUE);
+
+                    AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                                  AFS_TRACE_LEVEL_VERBOSE,
+                                  "AFSEnumerateDirectory Directory Complete FID %08lX-%08lX-%08lX-%08lX Snapshot-DV %08lX:%08lX Current-DV %08lX:%08lX Status %08lX\n",
+                                  ObjectInfoCB->FileId.Cell,
+                                  ObjectInfoCB->FileId.Volume,
+                                  ObjectInfoCB->FileId.Vnode,
+                                  ObjectInfoCB->FileId.Unique,
+                                  pDirEnumResponse->SnapshotDataVersion.HighPart,
+                                  pDirEnumResponse->SnapshotDataVersion.LowPart,
+                                  pDirEnumResponse->CurrentDataVersion.HighPart,
+                                  pDirEnumResponse->CurrentDataVersion.LowPart,
+                                  ntStatus);
+
+                    ObjectInfoCB->DataVersion = pDirEnumResponse->SnapshotDataVersion;
+
+                    if ( pDirEnumResponse->SnapshotDataVersion.QuadPart != pDirEnumResponse->CurrentDataVersion.QuadPart )
+                    {
+
+                        SetFlag( ObjectInfoCB->Flags, AFS_OBJECT_FLAGS_VERIFY);
+
+                        ObjectInfoCB->DataVersion.QuadPart = (ULONGLONG)-1;
+
+                        AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                                      AFS_TRACE_LEVEL_VERBOSE,
+                                      "AFSEnumerateDirectory Force Verify due to DV change during enumeration FID %08lX-%08lX-%08lX-%08lX\n",
+                                      ObjectInfoCB->FileId.Cell,
+                                      ObjectInfoCB->FileId.Volume,
+                                      ObjectInfoCB->FileId.Vnode,
+                                      ObjectInfoCB->FileId.Unique);
+                    }
+
+                    AFSReleaseResource( ObjectInfoCB->Specific.Directory.DirectoryNodeHdr.TreeLock);
                 }
                 else
                 {
 
                     AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
-                                  AFS_TRACE_LEVEL_ERROR,
-                                  "AFSEnumerateDirectory Failed to enumerate directory Status %08lX\n",
+                                  AFS_TRACE_LEVEL_VERBOSE,
+                                  "AFSEnumerateDirectory Failed to enumerate directory FID %08lX-%08lX-%08lX-%08lX AuthGroup %wZ Status %08lX\n",
+                                  ObjectInfoCB->FileId.Cell,
+                                  ObjectInfoCB->FileId.Volume,
+                                  ObjectInfoCB->FileId.Vnode,
+                                  ObjectInfoCB->FileId.Unique,
+                                  &uniGUID,
                                   ntStatus);
                 }
 
@@ -164,6 +222,18 @@ AFSEnumerateDirectory( IN GUID *AuthGroup,
 
             pCurrentDirEntry = (AFSDirEnumEntry *)pDirEnumResponse->Entry;
 
+            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                          AFS_TRACE_LEVEL_VERBOSE,
+                          "AFSEnumerateDirectory Enumerating FID %08lX-%08lX-%08lX-%08lX Snapshot-DV %08lX:%08lX Current-DV %08lX:%08lX\n",
+                          ObjectInfoCB->FileId.Cell,
+                          ObjectInfoCB->FileId.Volume,
+                          ObjectInfoCB->FileId.Vnode,
+                          ObjectInfoCB->FileId.Unique,
+                          pDirEnumResponse->SnapshotDataVersion.HighPart,
+                          pDirEnumResponse->SnapshotDataVersion.LowPart,
+                          pDirEnumResponse->CurrentDataVersion.HighPart,
+                          pDirEnumResponse->CurrentDataVersion.LowPart);
+
             //
             // Remove the leading header from the processed length
             //
@@ -200,25 +270,114 @@ AFSEnumerateDirectory( IN GUID *AuthGroup,
                 {
 
                     //
-                    // Duplicate entry, skip it
+                    // Check that the FIDs are the same
                     //
 
-                    ulEntryLength = QuadAlign( sizeof( AFSDirEnumEntry) +
-                                                    uniDirName.Length +
-                                                    uniTargetName.Length);
+                    if( AFSIsEqualFID( &pCurrentDirEntry->FileId,
+                                       &pDirNode->ObjectInformation->FileId))
+                    {
 
-                    pCurrentDirEntry = (AFSDirEnumEntry *)((char *)pCurrentDirEntry + ulEntryLength);
+                        //
+                        // Duplicate entry, skip it
+                        //
 
-                    if( ulResultLen >= ulEntryLength)
-                    {
-                        ulResultLen -= ulEntryLength;
+                        ulEntryLength = QuadAlign( sizeof( AFSDirEnumEntry) +
+                                                   uniDirName.Length +
+                                                   uniTargetName.Length);
+
+                        pCurrentDirEntry = (AFSDirEnumEntry *)((char *)pCurrentDirEntry + ulEntryLength);
+
+                        if( ulResultLen >= ulEntryLength)
+                        {
+                            ulResultLen -= ulEntryLength;
+                        }
+                        else
+                        {
+                            ulResultLen = 0;
+                        }
+
+                        //
+                        // Update the metadata for the entry
+                        //
+
+                        if( pDirNode->ObjectInformation->DataVersion.QuadPart != pCurrentDirEntry->DataVersion.QuadPart)
+                        {
+
+                            LONG lCount;
+                            AFSObjectInfoCB *pObjectInfo = pDirNode->ObjectInformation;
+
+                            lCount = InterlockedIncrement( &pObjectInfo->ObjectReferenceCount);
+
+                            AFSInvalidateObject( &pObjectInfo,
+                                                 AFS_INVALIDATE_DATA_VERSION);
+
+                            if( pObjectInfo != NULL)
+                            {
+
+                                lCount = InterlockedDecrement( &pObjectInfo->ObjectReferenceCount);
+                            }
+                        }
+                        else
+                        {
+
+                            AFSUpdateMetaData( pDirNode,
+                                               pCurrentDirEntry);
+                        }
+
+                        continue;
                     }
                     else
                     {
-                        ulResultLen = 0;
-                    }
 
-                    continue;
+                        //
+                        // Need to tear down this entry and rebuild it below
+                        //
+
+                        if( pDirNode->OpenReferenceCount == 0)
+                        {
+
+                            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                                          AFS_TRACE_LEVEL_VERBOSE,
+                                          "AFSEnumerateDirectory Different FIDs - Deleting DE %p for %wZ Old FID %08lX-%08lX-%08lX-%08lX New FID %08lX-%08lX-%08lX-%08lX\n",
+                                          pDirNode,
+                                          &pDirNode->NameInformation.FileName,
+                                          pDirNode->ObjectInformation->FileId.Cell,
+                                          pDirNode->ObjectInformation->FileId.Volume,
+                                          pDirNode->ObjectInformation->FileId.Vnode,
+                                          pDirNode->ObjectInformation->FileId.Unique,
+                                          pCurrentDirEntry->FileId.Cell,
+                                          pCurrentDirEntry->FileId.Volume,
+                                          pCurrentDirEntry->FileId.Vnode,
+                                          pCurrentDirEntry->FileId.Unique);
+
+                            AFSDeleteDirEntry( ObjectInfoCB,
+                                               pDirNode);
+                        }
+                        else
+                        {
+
+                            SetFlag( pDirNode->Flags, AFS_DIR_ENTRY_DELETED);
+
+                            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                                          AFS_TRACE_LEVEL_VERBOSE,
+                                          "AFSEnumerateDirectory Different FIDs - Removing DE %p for %wZ Old FID %08lX-%08lX-%08lX-%08lX New FID %08lX-%08lX-%08lX-%08lX\n",
+                                          pDirNode,
+                                          &pDirNode->NameInformation.FileName,
+                                          pDirNode->ObjectInformation->FileId.Cell,
+                                          pDirNode->ObjectInformation->FileId.Volume,
+                                          pDirNode->ObjectInformation->FileId.Vnode,
+                                          pDirNode->ObjectInformation->FileId.Unique,
+                                          pCurrentDirEntry->FileId.Cell,
+                                          pCurrentDirEntry->FileId.Volume,
+                                          pCurrentDirEntry->FileId.Vnode,
+                                          pCurrentDirEntry->FileId.Unique);
+
+                            AFSRemoveNameEntry( ObjectInfoCB,
+                                                pDirNode);
+                        }
+
+                        pDirNode = NULL;
+                    }
                 }
 
                 pDirNode = AFSInitDirEntry( ObjectInfoCB,
@@ -235,13 +394,38 @@ AFSEnumerateDirectory( IN GUID *AuthGroup,
                     break;
                 }
 
+                AFSUpdateMetaData( pDirNode,
+                                   pCurrentDirEntry);
+
+                if( pDirNode->ObjectInformation->FileType == AFS_FILE_TYPE_DIRECTORY)
+                {
+
+                    AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                                  AFS_TRACE_LEVEL_VERBOSE,
+                                  "AFSEnumerateDirectory Setting VERIFY on entry %wZ for FID %08lX-%08lX-%08lX-%08lX\n",
+                                  &uniDirName,
+                                  pDirNode->ObjectInformation->FileId.Cell,
+                                  pDirNode->ObjectInformation->FileId.Volume,
+                                  pDirNode->ObjectInformation->FileId.Vnode,
+                                  pDirNode->ObjectInformation->FileId.Unique);
+
+                    AFSAcquireExcl( pDirNode->ObjectInformation->Specific.Directory.DirectoryNodeHdr.TreeLock,
+                                    TRUE);
+
+                    SetFlag( pDirNode->ObjectInformation->Flags, AFS_OBJECT_FLAGS_VERIFY);
+
+                    pDirNode->ObjectInformation->DataVersion.QuadPart = (ULONGLONG)-1;
+
+                    AFSReleaseResource( pDirNode->ObjectInformation->Specific.Directory.DirectoryNodeHdr.TreeLock);
+                }
+
                 //
                 // Set up the entry length
                 //
 
                 ulEntryLength = QuadAlign( sizeof( AFSDirEnumEntry) +
-                                                    pCurrentDirEntry->FileNameLength +
-                                                    pCurrentDirEntry->TargetNameLength);
+                                           pCurrentDirEntry->FileNameLength +
+                                           pCurrentDirEntry->TargetNameLength);
 
                 //
                 // Init the short name if we have one
@@ -298,8 +482,6 @@ AFSEnumerateDirectory( IN GUID *AuthGroup,
                 // Insert the node into the name tree
                 //
 
-                ASSERT( ExIsResourceAcquiredExclusiveLite( ObjectInfoCB->Specific.Directory.DirectoryNodeHdr.TreeLock));
-
                 if( ObjectInfoCB->Specific.Directory.DirectoryNodeHdr.CaseSensitiveTreeHead == NULL)
                 {
 
@@ -469,16 +651,6 @@ AFSEnumerateDirectory( IN GUID *AuthGroup,
                           AFS_TRACE_LEVEL_VERBOSE,
                           "AFSEnumerateDirectory EnumHandle %08lX\n",
                           pDirQueryCB->EnumHandle);
-
-            //
-            // If the enumeration handle is -1 then we are done
-            //
-
-            if( ((ULONG)-1) == pDirQueryCB->EnumHandle )
-            {
-
-                break;
-            }
         }
 
 try_exit:
@@ -587,10 +759,13 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB,
     AFSObjectInfoCB *pObjectInfo = NULL;
     ULONGLONG ullIndex = 0;
     UNICODE_STRING uniGUID;
+    LONG lCount;
 
     __Enter
     {
 
+        ASSERT( ExIsResourceAcquiredExclusiveLite( ObjectInfoCB->Specific.Directory.DirectoryNodeHdr.TreeLock));
+
         uniGUID.Length = 0;
         uniGUID.MaximumLength = 0;
         uniGUID.Buffer = NULL;
@@ -650,18 +825,31 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB,
         {
 
             //
-            // Go and retrieve the directory contents
+            // If the enumeration handle is -1 then we are done
             //
 
-            ntStatus = AFSProcessRequest( AFS_REQUEST_TYPE_DIR_ENUM,
-                                          ulRequestFlags,
-                                          AuthGroup,
-                                          NULL,
-                                          &ObjectInfoCB->FileId,
-                                          (void *)pDirQueryCB,
-                                          sizeof( AFSDirQueryCB),
-                                          pBuffer,
-                                          &ulResultLen);
+            if( ((ULONG)-1) == pDirQueryCB->EnumHandle )
+            {
+
+                ntStatus = STATUS_NO_MORE_ENTRIES;
+            }
+            else
+            {
+
+                //
+                // Go and retrieve the directory contents
+                //
+
+                ntStatus = AFSProcessRequest( AFS_REQUEST_TYPE_DIR_ENUM,
+                                              ulRequestFlags,
+                                              AuthGroup,
+                                              NULL,
+                                              &ObjectInfoCB->FileId,
+                                              (void *)pDirQueryCB,
+                                              sizeof( AFSDirQueryCB),
+                                              pBuffer,
+                                              &ulResultLen);
+            }
 
             if( ntStatus != STATUS_SUCCESS ||
                 ulResultLen == 0)
@@ -671,14 +859,60 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB,
                     ntStatus == STATUS_NO_MORE_ENTRIES)
                 {
 
+                    pDirEnumResponse = (AFSDirEnumResp *)pBuffer;
+
+                    AFSAcquireExcl( ObjectInfoCB->Specific.Directory.DirectoryNodeHdr.TreeLock,
+                                    TRUE);
+
+                    AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                                  AFS_TRACE_LEVEL_VERBOSE,
+                                  "AFSVerifyDirectoryContent Directory Complete FID %08lX-%08lX-%08lX-%08lX Snapshot-DV %08lX:%08lX Current-DV %08lX:%08lX Status %08lX\n",
+                                  ObjectInfoCB->FileId.Cell,
+                                  ObjectInfoCB->FileId.Volume,
+                                  ObjectInfoCB->FileId.Vnode,
+                                  ObjectInfoCB->FileId.Unique,
+                                  pDirEnumResponse->SnapshotDataVersion.HighPart,
+                                  pDirEnumResponse->SnapshotDataVersion.LowPart,
+                                  pDirEnumResponse->CurrentDataVersion.HighPart,
+                                  pDirEnumResponse->CurrentDataVersion.LowPart,
+                                  ntStatus);
+
                     ntStatus = STATUS_SUCCESS;
+
+                    if ( pDirEnumResponse->SnapshotDataVersion.QuadPart != pDirEnumResponse->CurrentDataVersion.QuadPart )
+                    {
+
+                        SetFlag( ObjectInfoCB->Flags, AFS_OBJECT_FLAGS_VERIFY);
+
+                        ObjectInfoCB->DataVersion.QuadPart = (ULONGLONG)-1;
+
+                        AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                                      AFS_TRACE_LEVEL_VERBOSE,
+                                      "AFSVerifyDirectoryContent Force Verify due to DV change during enumeration FID %08lX-%08lX-%08lX-%08lX\n",
+                                      ObjectInfoCB->FileId.Cell,
+                                      ObjectInfoCB->FileId.Volume,
+                                      ObjectInfoCB->FileId.Vnode,
+                                      ObjectInfoCB->FileId.Unique);
+                    }
+                    else
+                    {
+
+                        ObjectInfoCB->DataVersion = pDirEnumResponse->SnapshotDataVersion;
+                    }
+
+                    AFSReleaseResource( ObjectInfoCB->Specific.Directory.DirectoryNodeHdr.TreeLock);
                 }
                 else
                 {
 
                     AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
                                   AFS_TRACE_LEVEL_ERROR,
-                                  "AFSVerifyDirectoryContent Failed to enumerate directory Status %08lX\n",
+                                  "AFSVerifyDirectoryContent Failed to enumerate directory FID %08lX-%08lX-%08lX-%08lX AuthGroup %wZ Status %08lX\n",
+                                  ObjectInfoCB->FileId.Cell,
+                                  ObjectInfoCB->FileId.Volume,
+                                  ObjectInfoCB->FileId.Vnode,
+                                  ObjectInfoCB->FileId.Unique,
+                                  &uniGUID,
                                   ntStatus);
                 }
 
@@ -689,6 +923,18 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB,
 
             pCurrentDirEntry = (AFSDirEnumEntry *)pDirEnumResponse->Entry;
 
+            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                          AFS_TRACE_LEVEL_VERBOSE,
+                          "AFSVerifyDirectoryContent EnumResponse FID %08lX-%08lX-%08lX-%08lX Snapshot-DV %08lX:%08lX Current-DV %08lX:%08lX\n",
+                          ObjectInfoCB->FileId.Cell,
+                          ObjectInfoCB->FileId.Volume,
+                          ObjectInfoCB->FileId.Vnode,
+                          ObjectInfoCB->FileId.Unique,
+                          pDirEnumResponse->SnapshotDataVersion.HighPart,
+                          pDirEnumResponse->SnapshotDataVersion.LowPart,
+                          pDirEnumResponse->CurrentDataVersion.HighPart,
+                          pDirEnumResponse->CurrentDataVersion.LowPart);
+
             //
             // Remove the leading header from the processed length
             //
@@ -717,8 +963,6 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB,
                 ulCRC = AFSGenerateCRC( &uniDirName,
                                         FALSE);
 
-                ASSERT( ExIsResourceAcquiredExclusiveLite( ObjectInfoCB->Specific.Directory.DirectoryNodeHdr.TreeLock));
-
                 AFSLocateCaseSensitiveDirEntry( ObjectInfoCB->Specific.Directory.DirectoryNodeHdr.CaseSensitiveTreeHead,
                                                 ulCRC,
                                                 &pDirNode);
@@ -732,135 +976,142 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB,
                                            pCurrentDirEntry->FileNameLength +
                                            pCurrentDirEntry->TargetNameLength);
 
-                if( pDirNode != NULL)
+                if( pDirNode &&
+                    AFSIsEqualFID( &pCurrentDirEntry->FileId,
+                                   &pDirNode->ObjectInformation->FileId))
                 {
 
                     //
-                    // Check that the FIDs are the same
+                    // Found matching directory entry by name and FileID
                     //
 
-                    if( AFSIsEqualFID( &pCurrentDirEntry->FileId,
-                                       &pDirNode->ObjectInformation->FileId))
-                    {
-
-                        AFSAcquireShared( ObjectInfoCB->VolumeCB->ObjectInfoTree.TreeLock,
-                                          TRUE);
+                    AFSAcquireShared( ObjectInfoCB->VolumeCB->ObjectInfoTree.TreeLock,
+                                      TRUE);
 
-                        ullIndex = AFSCreateLowIndex( &pCurrentDirEntry->FileId);
+                    ullIndex = AFSCreateLowIndex( &pCurrentDirEntry->FileId);
 
-                        ntStatus = AFSLocateHashEntry( ObjectInfoCB->VolumeCB->ObjectInfoTree.TreeHead,
-                                                       ullIndex,
-                                                       (AFSBTreeEntry **)&pObjectInfo);
+                    ntStatus = AFSLocateHashEntry( ObjectInfoCB->VolumeCB->ObjectInfoTree.TreeHead,
+                                                   ullIndex,
+                                                   (AFSBTreeEntry **)&pObjectInfo);
 
-                        AFSReleaseResource( ObjectInfoCB->VolumeCB->ObjectInfoTree.TreeLock);
+                    AFSReleaseResource( ObjectInfoCB->VolumeCB->ObjectInfoTree.TreeLock);
 
-                        if( NT_SUCCESS( ntStatus) &&
-                            pObjectInfo != NULL)
-                        {
+                    if( NT_SUCCESS( ntStatus) &&
+                        pObjectInfo != NULL)
+                    {
 
-                            //
-                            // Indicate this is a valid entry
-                            //
+                        //
+                        // Indicate this is a valid entry
+                        //
 
-                            SetFlag( pDirNode->Flags, AFS_DIR_ENTRY_VALID);
+                        SetFlag( pDirNode->Flags, AFS_DIR_ENTRY_VALID);
 
-                            if( pCurrentDirEntry->ShortNameLength > 0 &&
-                                pDirNode->NameInformation.ShortNameLength > 0)
-                            {
-                                AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
-                                              AFS_TRACE_LEVEL_VERBOSE,
-                                              "AFSVerifyDirectoryContent Verified entry %wZ (%wZ) old short name %S New short name %S\n",
-                                              &uniDirName,
-                                              &pDirNode->NameInformation.FileName,
-                                              pDirNode->NameInformation.ShortName,
-                                              pCurrentDirEntry->ShortName);
-                            }
-                            else if( pCurrentDirEntry->ShortNameLength == 0 &&
-                                     pDirNode->NameInformation.ShortNameLength > 0)
-                            {
-                                AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
-                                              AFS_TRACE_LEVEL_VERBOSE,
-                                              "AFSVerifyDirectoryContent Verified entry %wZ (%wZ) old short name %S New short name NULL\n",
-                                              &uniDirName,
-                                              &pDirNode->NameInformation.FileName,
-                                              pDirNode->NameInformation.ShortName);
-                            }
-                            else if( pCurrentDirEntry->ShortNameLength > 0 &&
-                                     pDirNode->NameInformation.ShortNameLength == 0)
-                            {
-                                AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
-                                              AFS_TRACE_LEVEL_VERBOSE,
-                                              "AFSVerifyDirectoryContent Verified entry %wZ (%wZ) old short name NULL New short name %S\n",
-                                              &uniDirName,
-                                              &pDirNode->NameInformation.FileName,
-                                              pCurrentDirEntry->ShortName);
-                            }
-                            else
-                            {
-                                AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
-                                              AFS_TRACE_LEVEL_VERBOSE,
-                                              "AFSVerifyDirectoryContent Verified entry %wZ (%wZ) old short name NULL New short name NULL\n",
-                                              &uniDirName,
-                                              &pDirNode->NameInformation.FileName);
-                            }
+                        if( pCurrentDirEntry->ShortNameLength > 0 &&
+                            pDirNode->NameInformation.ShortNameLength > 0)
+                        {
+                            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                                          AFS_TRACE_LEVEL_VERBOSE,
+                                          "AFSVerifyDirectoryContent Verified entry %wZ (%wZ) parent FID %08lX-%08lX-%08lX-%08lX old short name %S New short name %S\n",
+                                          &uniDirName,
+                                          &pDirNode->NameInformation.FileName,
+                                          ObjectInfoCB->FileId.Cell,
+                                          ObjectInfoCB->FileId.Volume,
+                                          ObjectInfoCB->FileId.Vnode,
+                                          ObjectInfoCB->FileId.Unique,
+                                          pDirNode->NameInformation.ShortName,
+                                          pCurrentDirEntry->ShortName);
+                        }
+                        else if( pCurrentDirEntry->ShortNameLength == 0 &&
+                                 pDirNode->NameInformation.ShortNameLength > 0)
+                        {
 
                             AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
                                           AFS_TRACE_LEVEL_VERBOSE,
-                                          "AFSVerifyDirectoryContent Verified entry %wZ for parent FID %08lX-%08lX-%08lX-%08lX\n",
+                                          "AFSVerifyDirectoryContent Verified entry %wZ (%wZ) parent FID %08lX-%08lX-%08lX-%08lX old short name %S New short name NULL\n",
                                           &uniDirName,
+                                          &pDirNode->NameInformation.FileName,
+                                          ObjectInfoCB->FileId.Cell,
+                                          ObjectInfoCB->FileId.Volume,
+                                          ObjectInfoCB->FileId.Vnode,
+                                          ObjectInfoCB->FileId.Unique,
+                                          pDirNode->NameInformation.ShortName);
+                        }
+                        else if( pCurrentDirEntry->ShortNameLength > 0 &&
+                                 pDirNode->NameInformation.ShortNameLength == 0)
+                        {
+                            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                                          AFS_TRACE_LEVEL_VERBOSE,
+                                          "AFSVerifyDirectoryContent Verified entry %wZ (%wZ) parent FID %08lX-%08lX-%08lX-%08lX old short name NULL New short name %S\n",
+                                          &uniDirName,
+                                          &pDirNode->NameInformation.FileName,
+                                          ObjectInfoCB->FileId.Cell,
+                                          ObjectInfoCB->FileId.Volume,
+                                          ObjectInfoCB->FileId.Vnode,
+                                          ObjectInfoCB->FileId.Unique,
+                                          pCurrentDirEntry->ShortName);
+                        }
+                        else
+                        {
+                            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                                          AFS_TRACE_LEVEL_VERBOSE,
+                                          "AFSVerifyDirectoryContent Verified entry %wZ (%wZ) parent FID %08lX-%08lX-%08lX-%08lX old short name NULL New short name NULL\n",
+                                          &uniDirName,
+                                          &pDirNode->NameInformation.FileName,
                                           ObjectInfoCB->FileId.Cell,
                                           ObjectInfoCB->FileId.Volume,
                                           ObjectInfoCB->FileId.Vnode,
                                           ObjectInfoCB->FileId.Unique);
+                        }
+
+                        //
+                        // Update the metadata for the entry
+                        //
+
+                        if( pObjectInfo->DataVersion.QuadPart != pCurrentDirEntry->DataVersion.QuadPart)
+                        {
 
+                            lCount = InterlockedIncrement( &pObjectInfo->ObjectReferenceCount);
 
-                            //
-                            // Update the metadata for the entry
-                            //
+                            AFSInvalidateObject( &pObjectInfo,
+                                                 AFS_INVALIDATE_DATA_VERSION);
 
-                            if( pObjectInfo->DataVersion.QuadPart == 0 ||
-                                pObjectInfo->DataVersion.QuadPart != pCurrentDirEntry->DataVersion.QuadPart)
+                            if( pObjectInfo != NULL)
                             {
 
-                                AFSUpdateMetaData( pDirNode,
-                                                   pCurrentDirEntry);
-
-                                if( pObjectInfo->FileType == AFS_FILE_TYPE_DIRECTORY)
-                                {
-
-                                    AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
-                                                  AFS_TRACE_LEVEL_VERBOSE,
-                                                  "AFSVerifyDirectoryContent Setting VERIFY on entry %wZ for FID %08lX-%08lX-%08lX-%08lX\n",
-                                                  &uniDirName,
-                                                  pObjectInfo->FileId.Cell,
-                                                  pObjectInfo->FileId.Volume,
-                                                  pObjectInfo->FileId.Vnode,
-                                                  pObjectInfo->FileId.Unique);
-
-                                    SetFlag( pObjectInfo->Flags, AFS_OBJECT_FLAGS_VERIFY);
-                                    pObjectInfo->DataVersion.QuadPart = (ULONGLONG)-1;
-                                    pObjectInfo->Expiration.QuadPart = 0;
-                                }
+                                lCount = InterlockedDecrement( &pObjectInfo->ObjectReferenceCount);
                             }
+                        }
+                        else
+                        {
 
-                            //
-                            // Next dir entry
-                            //
+                            AFSUpdateMetaData( pDirNode,
+                                               pCurrentDirEntry);
+                        }
 
-                            pCurrentDirEntry = (AFSDirEnumEntry *)((char *)pCurrentDirEntry + ulEntryLength);
+                        //
+                        // Next dir entry
+                        //
 
-                            if( ulResultLen >= ulEntryLength)
-                            {
-                                ulResultLen -= ulEntryLength;
-                            }
-                            else
-                            {
-                                ulResultLen = 0;
-                            }
+                        pCurrentDirEntry = (AFSDirEnumEntry *)((char *)pCurrentDirEntry + ulEntryLength);
 
-                            continue;
+                        if( ulResultLen >= ulEntryLength)
+                        {
+                            ulResultLen -= ulEntryLength;
                         }
+                        else
+                        {
+                            ulResultLen = 0;
+                        }
+
+                        continue;
                     }
+                }
+                else if ( pDirNode)
+                {
+
+                    //
+                    // File name matches but FileID does not.
+                    //
 
                     AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
                                   AFS_TRACE_LEVEL_VERBOSE,
@@ -902,7 +1153,7 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB,
                         SetFlag( pDirNode->Flags, AFS_DIR_ENTRY_DELETED);
 
                         AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
-                                      AFS_TRACE_LEVEL_VERBOSE,
+                                      AFS_TRACE_LEVEL_WARNING,
                                       "AFSVerifyDirectoryContent Different FIDs - removing DE %p for %wZ Old FID %08lX-%08lX-%08lX-%08lX New FID %08lX-%08lX-%08lX-%08lX\n",
                                       pDirNode,
                                       &pDirNode->NameInformation.FileName,
@@ -919,6 +1170,18 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB,
                                             pDirNode);
                     }
                 }
+                else
+                {
+
+                    AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                                  AFS_TRACE_LEVEL_VERBOSE,
+                                  "AFSVerifyDirectoryContent New entry %wZ for parent FID %08lX-%08lX-%08lX-%08lX\n",
+                                  &uniDirName,
+                                  ObjectInfoCB->FileId.Cell,
+                                  ObjectInfoCB->FileId.Volume,
+                                  ObjectInfoCB->FileId.Vnode,
+                                  ObjectInfoCB->FileId.Unique);
+                }
 
                 pDirNode = AFSInitDirEntry( ObjectInfoCB,
                                             &uniDirName,
@@ -934,6 +1197,31 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB,
                     break;
                 }
 
+                AFSUpdateMetaData( pDirNode,
+                                   pCurrentDirEntry);
+
+                if( pDirNode->ObjectInformation->FileType == AFS_FILE_TYPE_DIRECTORY)
+                {
+
+                    AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                                  AFS_TRACE_LEVEL_VERBOSE,
+                                  "AFSVerifyDirectoryContent Setting VERIFY on entry %wZ for FID %08lX-%08lX-%08lX-%08lX\n",
+                                  &uniDirName,
+                                  pDirNode->ObjectInformation->FileId.Cell,
+                                  pDirNode->ObjectInformation->FileId.Volume,
+                                  pDirNode->ObjectInformation->FileId.Vnode,
+                                  pDirNode->ObjectInformation->FileId.Unique);
+
+                    AFSAcquireExcl( pDirNode->ObjectInformation->Specific.Directory.DirectoryNodeHdr.TreeLock,
+                                    TRUE);
+
+                    SetFlag( pDirNode->ObjectInformation->Flags, AFS_OBJECT_FLAGS_VERIFY);
+
+                    pDirNode->ObjectInformation->DataVersion.QuadPart = (ULONGLONG)-1;
+
+                    AFSReleaseResource( pDirNode->ObjectInformation->Specific.Directory.DirectoryNodeHdr.TreeLock);
+                }
+
                 //
                 // Init the short name if we have one
                 //
@@ -1160,6 +1448,8 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB,
                     }
                 }
 
+                SetFlag( pDirNode->Flags, AFS_DIR_ENTRY_VALID);
+
                 //
                 // Next dir entry
                 //
@@ -1184,16 +1474,6 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB,
             //
 
             pDirQueryCB->EnumHandle = pDirEnumResponse->EnumHandle;
-
-            //
-            // If the enumeration handle is -1 then we are done
-            //
-
-            if( ((ULONG)-1) == pDirQueryCB->EnumHandle )
-            {
-
-                break;
-            }
         }
 
 try_exit:
@@ -1302,14 +1582,22 @@ AFSNotifyFileCreate( IN GUID            *AuthGroup,
         // The check is to ensure the DV has been modified
         //
 
-        if( liOldDataVersion.QuadPart != pResultCB->ParentDataVersion.QuadPart - 1 ||
-            liOldDataVersion.QuadPart != ParentObjectInfo->DataVersion.QuadPart)
+        AFSAcquireExcl( ParentObjectInfo->Specific.Directory.DirectoryNodeHdr.TreeLock,
+                        TRUE);
+
+        if( ParentObjectInfo->DataVersion.QuadPart != pResultCB->ParentDataVersion.QuadPart - 1)
         {
 
             AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
-                          AFS_TRACE_LEVEL_VERBOSE,
-                          "AFSNotifyFileCreate Raced with an invalidate call and a re-enumeration for entry %wZ\n",
-                          FileName);
+                          AFS_TRACE_LEVEL_WARNING,
+                          "AFSNotifyFileCreate Raced with an invalidate call and a re-enumeration for entry %wZ ParentFID %08lX-%08lX-%08lX-%08lX Version (%08lX:%08lX != %08lX:%08lX - 1)\n",
+                          FileName,
+                          ParentObjectInfo->FileId.Cell,
+                          ParentObjectInfo->FileId.Volume,
+                          ParentObjectInfo->FileId.Vnode,
+                          ParentObjectInfo->FileId.Unique,
+                          ParentObjectInfo->DataVersion.QuadPart,
+                          pResultCB->ParentDataVersion.QuadPart);
 
             //
             // We raced so go and lookup the directory entry in the parent
@@ -1318,9 +1606,6 @@ AFSNotifyFileCreate( IN GUID            *AuthGroup,
             ulCRC = AFSGenerateCRC( FileName,
                                     FALSE);
 
-            AFSAcquireShared( ParentObjectInfo->Specific.Directory.DirectoryNodeHdr.TreeLock,
-                              TRUE);
-
             AFSLocateCaseSensitiveDirEntry( ParentObjectInfo->Specific.Directory.DirectoryNodeHdr.CaseSensitiveTreeHead,
                                             ulCRC,
                                             &pDirNode);
@@ -1330,26 +1615,97 @@ AFSNotifyFileCreate( IN GUID            *AuthGroup,
 
                 AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
                               AFS_TRACE_LEVEL_VERBOSE,
-                              "AFSNotifyFileCreate Located dir entry for file %wZ\n",
+                              "AFSNotifyFileCreate Located dir entry %p for file %wZ\n",
+                              pDirNode,
                               FileName);
 
-                InterlockedIncrement( &pDirNode->OpenReferenceCount);
+                if ( AFSIsEqualFID( &pDirNode->ObjectInformation->FileId,
+                                    &pResultCB->DirEnum.FileId))
+                {
 
-                AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
-                              AFS_TRACE_LEVEL_VERBOSE,
-                              "AFSNotifyFileCreate Increment count on %wZ DE %p Cnt %d\n",
-                              &pDirNode->NameInformation.FileName,
-                              pDirNode,
-                              pDirNode->OpenReferenceCount);
+                    InterlockedIncrement( &pDirNode->OpenReferenceCount);
 
-                *DirNode = pDirNode;
+                    AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
+                                  AFS_TRACE_LEVEL_VERBOSE,
+                                  "AFSNotifyFileCreate Increment count on %wZ DE %p Cnt %d\n",
+                                  &pDirNode->NameInformation.FileName,
+                                  pDirNode,
+                                  pDirNode->OpenReferenceCount);
 
-                AFSReleaseResource( ParentObjectInfo->Specific.Directory.DirectoryNodeHdr.TreeLock);
+                    *DirNode = pDirNode;
 
-                try_return( ntStatus = STATUS_REPARSE);
-            }
+                    AFSReleaseResource( ParentObjectInfo->Specific.Directory.DirectoryNodeHdr.TreeLock);
 
-            AFSReleaseResource( ParentObjectInfo->Specific.Directory.DirectoryNodeHdr.TreeLock);
+                    try_return( ntStatus = STATUS_REPARSE);
+                }
+                else
+                {
+
+                    //
+                    // We found an entry that matches the desired name but it is not the
+                    // same as the one that was created for us by the file server.
+                    //
+
+                    AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                                  AFS_TRACE_LEVEL_ERROR,
+                                  "AFSNotifyFileCreate Found matching name entry %wZ DE %p FID %08lX-%08lX-%08lX-%08lX != FID %08lX-%08lX-%08lX-%08lX\n",
+                                  FileName,
+                                  pDirNode,
+                                  pDirNode->ObjectInformation->FileId.Cell,
+                                  pDirNode->ObjectInformation->FileId.Volume,
+                                  pDirNode->ObjectInformation->FileId.Vnode,
+                                  pDirNode->ObjectInformation->FileId.Unique,
+                                  pResultCB->DirEnum.FileId.Cell,
+                                  pResultCB->DirEnum.FileId.Volume,
+                                  pResultCB->DirEnum.FileId.Vnode,
+                                  pResultCB->DirEnum.FileId.Unique);
+
+                    if( pDirNode->OpenReferenceCount == 0)
+                    {
+
+                        AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                                      AFS_TRACE_LEVEL_VERBOSE,
+                                      "AFSNotifyFileCreate Different FIDs - Deleting DE %p for %wZ Old FID %08lX-%08lX-%08lX-%08lX New FID %08lX-%08lX-%08lX-%08lX\n",
+                                      pDirNode,
+                                      &pDirNode->NameInformation.FileName,
+                                      pDirNode->ObjectInformation->FileId.Cell,
+                                      pDirNode->ObjectInformation->FileId.Volume,
+                                      pDirNode->ObjectInformation->FileId.Vnode,
+                                      pDirNode->ObjectInformation->FileId.Unique,
+                                      pResultCB->DirEnum.FileId.Cell,
+                                      pResultCB->DirEnum.FileId.Volume,
+                                      pResultCB->DirEnum.FileId.Vnode,
+                                      pResultCB->DirEnum.FileId.Unique);
+
+                        AFSDeleteDirEntry( ParentObjectInfo,
+                                           pDirNode);
+                    }
+                    else
+                    {
+
+                        SetFlag( pDirNode->Flags, AFS_DIR_ENTRY_DELETED);
+
+                        AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                                      AFS_TRACE_LEVEL_VERBOSE,
+                                      "AFSNotifyFileCreate Different FIDs - Removing DE %p for %wZ Old FID %08lX-%08lX-%08lX-%08lX New FID %08lX-%08lX-%08lX-%08lX\n",
+                                      pDirNode,
+                                      &pDirNode->NameInformation.FileName,
+                                      pDirNode->ObjectInformation->FileId.Cell,
+                                      pDirNode->ObjectInformation->FileId.Volume,
+                                      pDirNode->ObjectInformation->FileId.Vnode,
+                                      pDirNode->ObjectInformation->FileId.Unique,
+                                      pResultCB->DirEnum.FileId.Cell,
+                                      pResultCB->DirEnum.FileId.Volume,
+                                      pResultCB->DirEnum.FileId.Vnode,
+                                      pResultCB->DirEnum.FileId.Unique);
+
+                        AFSRemoveNameEntry( ParentObjectInfo,
+                                            pDirNode);
+                    }
+
+                    pDirNode = NULL;
+                }
+            }
 
             //
             // We are unsure of our current data so set the verify flag. It may already be set
@@ -1360,15 +1716,6 @@ AFSNotifyFileCreate( IN GUID            *AuthGroup,
 
             ParentObjectInfo->DataVersion.QuadPart = (ULONGLONG)-1;
         }
-        else
-        {
-
-            //
-            // Update the parent data version
-            //
-
-            ParentObjectInfo->DataVersion = pResultCB->ParentDataVersion;
-        }
 
         AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
                       AFS_TRACE_LEVEL_VERBOSE,
@@ -1394,6 +1741,12 @@ AFSNotifyFileCreate( IN GUID            *AuthGroup,
         if( pDirNode == NULL)
         {
 
+            SetFlag( ParentObjectInfo->Flags, AFS_OBJECT_FLAGS_VERIFY);
+
+            ParentObjectInfo->DataVersion.QuadPart = (ULONGLONG)-1;
+
+            AFSReleaseResource( ParentObjectInfo->Specific.Directory.DirectoryNodeHdr.TreeLock);
+
             try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES);
         }
 
@@ -1430,6 +1783,28 @@ AFSNotifyFileCreate( IN GUID            *AuthGroup,
                           &pDirNode->NameInformation.FileName);
         }
 
+        if ( !BooleanFlagOn( ParentObjectInfo->Flags, AFS_OBJECT_FLAGS_VERIFY))
+        {
+
+            //
+            // Update the parent data version
+            //
+
+            ParentObjectInfo->DataVersion = pResultCB->ParentDataVersion;
+
+            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                          AFS_TRACE_LEVEL_VERBOSE,
+                          "AFSNotifyFileCreate entry %wZ ParentFID %08lX-%08lX-%08lX-%08lX Version %08lX:%08lX\n",
+                          FileName,
+                          ParentObjectInfo->FileId.Cell,
+                          ParentObjectInfo->FileId.Volume,
+                          ParentObjectInfo->FileId.Vnode,
+                          ParentObjectInfo->FileId.Unique,
+                          ParentObjectInfo->DataVersion.QuadPart);
+        }
+
+        AFSReleaseResource( ParentObjectInfo->Specific.Directory.DirectoryNodeHdr.TreeLock);
+
         //
         // Return the directory node
         //
@@ -1527,7 +1902,16 @@ AFSUpdateFileInformation( IN AFSFileID *ParentFid,
         // Update the data version
         //
 
-        ObjectInfo->DataVersion = pUpdateResultCB->DirEnum.DataVersion;
+        AFSAcquireExcl( ObjectInfo->Specific.Directory.DirectoryNodeHdr.TreeLock,
+                        TRUE);
+
+        if ( !BooleanFlagOn( ObjectInfo->Flags, AFS_OBJECT_FLAGS_VERIFY))
+        {
+
+            ObjectInfo->DataVersion = pUpdateResultCB->DirEnum.DataVersion;
+        }
+
+        AFSReleaseResource( ObjectInfo->Specific.Directory.DirectoryNodeHdr.TreeLock);
 
 try_exit:
 
@@ -1581,32 +1965,72 @@ AFSNotifyDelete( IN AFSDirectoryCB *DirectoryCB,
 
             AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
                           AFS_TRACE_LEVEL_ERROR,
-                          "AFSNotifyDelete failed FID %08lX-%08lX-%08lX-%08lX Status %08lX\n",
-                          &DirectoryCB->ObjectInformation->FileId.Cell,
-                          &DirectoryCB->ObjectInformation->FileId.Volume,
-                          &DirectoryCB->ObjectInformation->FileId.Vnode,
-                          &DirectoryCB->ObjectInformation->FileId.Unique,
+                          "AFSNotifyDelete failed ParentFID %08lX-%08lX-%08lX-%08lX %wZ FID %08lX-%08lX-%08lX-%08lX Status %08lX\n",
+                          stDelete.ParentId.Cell,
+                          stDelete.ParentId.Volume,
+                          stDelete.ParentId.Vnode,
+                          stDelete.ParentId.Unique,
+                          &DirectoryCB->NameInformation.FileName,
+                          DirectoryCB->ObjectInformation->FileId.Cell,
+                          DirectoryCB->ObjectInformation->FileId.Volume,
+                          DirectoryCB->ObjectInformation->FileId.Vnode,
+                          DirectoryCB->ObjectInformation->FileId.Unique,
                           ntStatus);
 
             try_return( ntStatus);
         }
 
-        if( !CheckOnly)
+        AFSAcquireExcl( DirectoryCB->ObjectInformation->Specific.Directory.DirectoryNodeHdr.TreeLock,
+                        TRUE);
+
+        if( CheckOnly)
+        {
+
+            //
+            // Validate the parent data version
+            //
+
+            if( DirectoryCB->ObjectInformation->ParentObjectInformation->DataVersion.QuadPart != stDeleteResult.ParentDataVersion.QuadPart)
+            {
+
+                SetFlag( DirectoryCB->ObjectInformation->ParentObjectInformation->Flags, AFS_OBJECT_FLAGS_VERIFY);
+
+                DirectoryCB->ObjectInformation->ParentObjectInformation->DataVersion.QuadPart = (ULONGLONG)-1;
+            }
+        }
+        else
         {
 
             //
             // Update the parent data version
             //
 
-            if( DirectoryCB->ObjectInformation->ParentObjectInformation->DataVersion.QuadPart != stDeleteResult.ParentDataVersion.QuadPart)
+            if( DirectoryCB->ObjectInformation->ParentObjectInformation->DataVersion.QuadPart != stDeleteResult.ParentDataVersion.QuadPart - 1)
             {
 
                 SetFlag( DirectoryCB->ObjectInformation->ParentObjectInformation->Flags, AFS_OBJECT_FLAGS_VERIFY);
 
                 DirectoryCB->ObjectInformation->ParentObjectInformation->DataVersion.QuadPart = (ULONGLONG)-1;
             }
+            else
+            {
+
+                //
+                // TODO -- The entry must be removed from the directory at which point the
+                // Directory data version number can be updated.  Until then we must force
+                // a verification.
+                //
+                // DirectoryCB->ObjectInformation->ParentObjectInformation->DataVersion.QuadPart = stDeleteResult.ParentDataVersion.QuadPart;
+                //
+
+                SetFlag( DirectoryCB->ObjectInformation->ParentObjectInformation->Flags, AFS_OBJECT_FLAGS_VERIFY);
+
+                DirectoryCB->ObjectInformation->ParentObjectInformation->DataVersion.QuadPart = (ULONGLONG)-1;
+            }
         }
 
+        AFSReleaseResource( DirectoryCB->ObjectInformation->Specific.Directory.DirectoryNodeHdr.TreeLock);
+
 try_exit:
 
         NOTHING;
@@ -1697,9 +2121,38 @@ AFSNotifyRename( IN AFSObjectInfoCB *ObjectInfo,
         // Update the information from the returned data
         //
 
-        ParentObjectInfo->DataVersion = pRenameResultCB->SourceParentDataVersion;
+        AFSAcquireExcl( ParentObjectInfo->Specific.Directory.DirectoryNodeHdr.TreeLock,
+                        TRUE);
 
-        TargetParentObjectInfo->DataVersion = pRenameResultCB->TargetParentDataVersion;
+        if ( ParentObjectInfo->DataVersion.QuadPart == pRenameResultCB->SourceParentDataVersion.QuadPart - 1)
+        {
+
+            ParentObjectInfo->DataVersion = pRenameResultCB->SourceParentDataVersion;
+        }
+        else
+        {
+
+            SetFlag( ParentObjectInfo->Flags, AFS_OBJECT_FLAGS_VERIFY);
+
+            ParentObjectInfo->DataVersion.QuadPart = (ULONGLONG)-1;
+        }
+
+        if ( ParentObjectInfo != TargetParentObjectInfo)
+        {
+
+            if ( TargetParentObjectInfo->DataVersion.QuadPart == pRenameResultCB->TargetParentDataVersion.QuadPart - 1)
+            {
+
+                TargetParentObjectInfo->DataVersion = pRenameResultCB->TargetParentDataVersion;
+            }
+            else
+            {
+
+                SetFlag( TargetParentObjectInfo->Flags, AFS_OBJECT_FLAGS_VERIFY);
+
+                TargetParentObjectInfo->DataVersion.QuadPart = (ULONGLONG)-1;
+            }
+        }
 
         //
         // Move over the short name
@@ -1761,6 +2214,8 @@ AFSNotifyRename( IN AFSObjectInfoCB *ObjectInfo,
             DirectoryCB->Type.Data.ShortNameTreeEntry.HashIndex = 0;
         }
 
+        AFSReleaseResource( ParentObjectInfo->Specific.Directory.DirectoryNodeHdr.TreeLock);
+
         if( UpdatedFID != NULL)
         {
             *UpdatedFID = pRenameResultCB->DirEnum.FileId;
@@ -1848,13 +2303,20 @@ AFSEvaluateTargetByID( IN AFSObjectInfoCB *ObjectInfo,
             // verification
             //
 
-            if( ntStatus == STATUS_INVALID_HANDLE)
+            if( ntStatus == STATUS_OBJECT_PATH_INVALID)
             {
 
                 if( ObjectInfo->ParentObjectInformation != NULL)
                 {
 
+                    AFSAcquireExcl( ObjectInfo->ParentObjectInformation->Specific.Directory.DirectoryNodeHdr.TreeLock,
+                                    TRUE);
+
                     SetFlag( ObjectInfo->ParentObjectInformation->Flags, AFS_OBJECT_FLAGS_VERIFY);
+
+                    ObjectInfo->ParentObjectInformation->DataVersion.QuadPart = (ULONGLONG)-1;
+
+                    AFSReleaseResource( ObjectInfo->ParentObjectInformation->Specific.Directory.DirectoryNodeHdr.TreeLock);
                 }
             }
 
@@ -1862,6 +2324,27 @@ AFSEvaluateTargetByID( IN AFSObjectInfoCB *ObjectInfo,
         }
 
         //
+        // Validate the parent data version
+        //
+
+        if ( ObjectInfo->ParentObjectInformation != NULL)
+        {
+
+            AFSAcquireExcl( ObjectInfo->ParentObjectInformation->Specific.Directory.DirectoryNodeHdr.TreeLock,
+                            TRUE);
+
+            if ( ObjectInfo->ParentObjectInformation->DataVersion.QuadPart != pEvalResultCB->ParentDataVersion.QuadPart)
+            {
+
+                SetFlag( ObjectInfo->ParentObjectInformation->Flags, AFS_OBJECT_FLAGS_VERIFY);
+
+                ObjectInfo->ParentObjectInformation->DataVersion.QuadPart = (ULONGLONG)-1;
+            }
+
+            AFSReleaseResource( ObjectInfo->ParentObjectInformation->Specific.Directory.DirectoryNodeHdr.TreeLock);
+        }
+
+        //
         // Pass back the dir enum entry
         //
 
@@ -1910,7 +2393,7 @@ try_exit:
 
 NTSTATUS
 AFSEvaluateTargetByName( IN GUID *AuthGroup,
-                         IN AFSFileID *ParentFileId,
+                         IN AFSObjectInfoCB *ParentObjectInfo,
                          IN PUNICODE_STRING SourceName,
                          OUT AFSDirEnumEntry **DirEnumEntry)
 {
@@ -1924,7 +2407,7 @@ AFSEvaluateTargetByName( IN GUID *AuthGroup,
     __Enter
     {
 
-        stTargetID.ParentId = *ParentFileId;
+        stTargetID.ParentId = ParentObjectInfo->FileId;
 
         //
         // Allocate our response buffer
@@ -1959,10 +2442,40 @@ AFSEvaluateTargetByName( IN GUID *AuthGroup,
         if( ntStatus != STATUS_SUCCESS)
         {
 
+            if( ntStatus == STATUS_OBJECT_PATH_INVALID)
+            {
+
+                AFSAcquireExcl( ParentObjectInfo->Specific.Directory.DirectoryNodeHdr.TreeLock,
+                                TRUE);
+
+                SetFlag( ParentObjectInfo->Flags, AFS_OBJECT_FLAGS_VERIFY);
+
+                ParentObjectInfo->DataVersion.QuadPart = (ULONGLONG)-1;
+
+                AFSReleaseResource( ParentObjectInfo->Specific.Directory.DirectoryNodeHdr.TreeLock);
+            }
+
             try_return( ntStatus);
         }
 
         //
+        // Validate the parent data version
+        //
+
+        AFSAcquireExcl( ParentObjectInfo->Specific.Directory.DirectoryNodeHdr.TreeLock,
+                        TRUE);
+
+        if ( ParentObjectInfo->DataVersion.QuadPart != pEvalResultCB->ParentDataVersion.QuadPart)
+        {
+
+            SetFlag( ParentObjectInfo->Flags, AFS_OBJECT_FLAGS_VERIFY);
+
+            ParentObjectInfo->DataVersion.QuadPart = (ULONGLONG)-1;
+        }
+
+        AFSReleaseResource( ParentObjectInfo->Specific.Directory.DirectoryNodeHdr.TreeLock);
+
+        //
         // Pass back the dir enum entry
         //