Windows: Use AFSLibExAllocatePool for library local
[openafs.git] / src / WINNT / afsrdr / kernel / lib / AFSCommSupport.cpp
index 028d8e9..c29dbc5 100644 (file)
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2008, 2009, 2010, 2011 Kernel Drivers, LLC.
- * Copyright (c) 2009, 2010, 2011 Your File System, Inc.
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Kernel Drivers, LLC.
+ * Copyright (c) 2009, 2010, 2011, 2012, 2013 Your File System, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * - Redistributions of source code must retain the above copyright notice,
  *   this list of conditions and the following disclaimer.
  * - Redistributions in binary form must reproduce the above copyright
- *   notice,
- *   this list of conditions and the following disclaimer in the
- *   documentation
- *   and/or other materials provided with the distribution.
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
  * - Neither the names of Kernel Drivers, LLC and Your File System, Inc.
  *   nor the names of their contributors may be used to endorse or promote
  *   products derived from this software without specific prior written
@@ -63,6 +61,12 @@ AFSEnumerateDirectory( IN GUID *AuthGroup,
 
         ASSERT( ExIsResourceAcquiredExclusiveLite( ObjectInfoCB->Specific.Directory.DirectoryNodeHdr.TreeLock));
 
+        if( BooleanFlagOn( ObjectInfoCB->Flags, AFS_OBJECT_FLAGS_DIRECTORY_ENUMERATED))
+        {
+
+            try_return( ntStatus = STATUS_SUCCESS);
+        }
+
         uniGUID.Length = 0;
         uniGUID.MaximumLength = 0;
         uniGUID.Buffer = NULL;
@@ -73,14 +77,14 @@ AFSEnumerateDirectory( IN GUID *AuthGroup,
                                &uniGUID);
         }
 
-        AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+        AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                       AFS_TRACE_LEVEL_VERBOSE,
                       "AFSEnumerateDirectory Enumerating FID %08lX-%08lX-%08lX-%08lX AuthGroup %wZ\n",
                       ObjectInfoCB->FileId.Cell,
                       ObjectInfoCB->FileId.Volume,
                       ObjectInfoCB->FileId.Vnode,
                       ObjectInfoCB->FileId.Unique,
-                      &uniGUID);
+                      &uniGUID));
 
         if( AuthGroup != NULL)
         {
@@ -91,9 +95,9 @@ AFSEnumerateDirectory( IN GUID *AuthGroup,
         // Initialize the directory enumeration buffer for the directory
         //
 
-        pBuffer = AFSExAllocatePoolWithTag( PagedPool,
-                                            AFS_DIR_ENUM_BUFFER_LEN,
-                                            AFS_DIR_BUFFER_TAG);
+       pBuffer = AFSLibExAllocatePoolWithTag( PagedPool,
+                                              AFS_DIR_ENUM_BUFFER_LEN,
+                                              AFS_DIR_BUFFER_TAG);
 
         if( pBuffer == NULL)
         {
@@ -148,6 +152,8 @@ AFSEnumerateDirectory( IN GUID *AuthGroup,
                                               AuthGroup,
                                               NULL,
                                               &ObjectInfoCB->FileId,
+                                              ObjectInfoCB->VolumeCB->VolumeInformation.Cell,
+                                              ObjectInfoCB->VolumeCB->VolumeInformation.CellLength,
                                               (void *)pDirQueryCB,
                                               sizeof( AFSDirQueryCB),
                                               pBuffer,
@@ -169,7 +175,7 @@ AFSEnumerateDirectory( IN GUID *AuthGroup,
                     AFSAcquireExcl( ObjectInfoCB->Specific.Directory.DirectoryNodeHdr.TreeLock,
                                     TRUE);
 
-                    AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                    AFSDbgTrace(( 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,
@@ -180,7 +186,7 @@ AFSEnumerateDirectory( IN GUID *AuthGroup,
                                   pDirEnumResponse->SnapshotDataVersion.LowPart,
                                   pDirEnumResponse->CurrentDataVersion.HighPart,
                                   pDirEnumResponse->CurrentDataVersion.LowPart,
-                                  ntStatus);
+                                  ntStatus));
 
                     ObjectInfoCB->DataVersion = pDirEnumResponse->SnapshotDataVersion;
 
@@ -191,13 +197,13 @@ AFSEnumerateDirectory( IN GUID *AuthGroup,
 
                         ObjectInfoCB->DataVersion.QuadPart = (ULONGLONG)-1;
 
-                        AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                        AFSDbgTrace(( 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);
+                                      ObjectInfoCB->FileId.Unique));
                     }
 
                     AFSReleaseResource( ObjectInfoCB->Specific.Directory.DirectoryNodeHdr.TreeLock);
@@ -205,7 +211,7 @@ AFSEnumerateDirectory( IN GUID *AuthGroup,
                 else
                 {
 
-                    AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                    AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                   AFS_TRACE_LEVEL_VERBOSE,
                                   "AFSEnumerateDirectory Failed to enumerate directory FID %08lX-%08lX-%08lX-%08lX AuthGroup %wZ Status %08lX\n",
                                   ObjectInfoCB->FileId.Cell,
@@ -213,7 +219,7 @@ AFSEnumerateDirectory( IN GUID *AuthGroup,
                                   ObjectInfoCB->FileId.Vnode,
                                   ObjectInfoCB->FileId.Unique,
                                   &uniGUID,
-                                  ntStatus);
+                                  ntStatus));
                 }
 
                 break;
@@ -223,7 +229,7 @@ AFSEnumerateDirectory( IN GUID *AuthGroup,
 
             pCurrentDirEntry = (AFSDirEnumEntry *)pDirEnumResponse->Entry;
 
-            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+            AFSDbgTrace(( 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,
@@ -233,7 +239,7 @@ AFSEnumerateDirectory( IN GUID *AuthGroup,
                           pDirEnumResponse->SnapshotDataVersion.HighPart,
                           pDirEnumResponse->SnapshotDataVersion.LowPart,
                           pDirEnumResponse->CurrentDataVersion.HighPart,
-                          pDirEnumResponse->CurrentDataVersion.LowPart);
+                          pDirEnumResponse->CurrentDataVersion.LowPart));
 
             //
             // Remove the leading header from the processed length
@@ -304,28 +310,6 @@ AFSEnumerateDirectory( IN GUID *AuthGroup,
                         if( pDirNode->ObjectInformation->DataVersion.QuadPart != pCurrentDirEntry->DataVersion.QuadPart)
                         {
 
-                            LONG lCount;
-                            AFSObjectInfoCB *pObjectInfo = pDirNode->ObjectInformation;
-
-                            //
-                            // The ObjectReferenceCount will be freed by AFSPerformObjectInvalidate
-                            //
-
-                            lCount = AFSObjectInfoIncrement( pObjectInfo,
-                                                             AFS_OBJECT_REFERENCE_INVALIDATION);
-
-                            AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING,
-                                          AFS_TRACE_LEVEL_VERBOSE,
-                                          "AFSEnumerateDirectory calling AFSPerformObjectInvalidate Increment count on object %p Cnt %d\n",
-                                          pObjectInfo,
-                                          lCount);
-
-                            AFSPerformObjectInvalidate( pObjectInfo,
-                                                        AFS_INVALIDATE_DATA_VERSION);
-                        }
-                        else
-                        {
-
                             AFSUpdateMetaData( pDirNode,
                                                pCurrentDirEntry);
                         }
@@ -339,10 +323,11 @@ AFSEnumerateDirectory( IN GUID *AuthGroup,
                         // Need to tear down this entry and rebuild it below
                         //
 
-                        if( pDirNode->DirOpenReferenceCount <= 0)
+                        if( pDirNode->DirOpenReferenceCount <= 0 &&
+                            pDirNode->NameArrayReferenceCount <= 0)
                         {
 
-                            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                            AFSDbgTrace(( 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,
@@ -354,17 +339,17 @@ AFSEnumerateDirectory( IN GUID *AuthGroup,
                                           pCurrentDirEntry->FileId.Cell,
                                           pCurrentDirEntry->FileId.Volume,
                                           pCurrentDirEntry->FileId.Vnode,
-                                          pCurrentDirEntry->FileId.Unique);
+                                          pCurrentDirEntry->FileId.Unique));
 
                             AFSDeleteDirEntry( ObjectInfoCB,
-                                               pDirNode);
+                                               &pDirNode);
                         }
                         else
                         {
 
                             SetFlag( pDirNode->Flags, AFS_DIR_ENTRY_DELETED);
 
-                            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                            AFSDbgTrace(( 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,
@@ -376,7 +361,7 @@ AFSEnumerateDirectory( IN GUID *AuthGroup,
                                           pCurrentDirEntry->FileId.Cell,
                                           pCurrentDirEntry->FileId.Volume,
                                           pCurrentDirEntry->FileId.Vnode,
-                                          pCurrentDirEntry->FileId.Unique);
+                                          pCurrentDirEntry->FileId.Unique));
 
                             AFSRemoveNameEntry( ObjectInfoCB,
                                                 pDirNode);
@@ -406,14 +391,14 @@ AFSEnumerateDirectory( IN GUID *AuthGroup,
                 if( pDirNode->ObjectInformation->FileType == AFS_FILE_TYPE_DIRECTORY)
                 {
 
-                    AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                    AFSDbgTrace(( 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);
+                                  pDirNode->ObjectInformation->FileId.Unique));
 
                     AFSAcquireExcl( pDirNode->ObjectInformation->Specific.Directory.DirectoryNodeHdr.TreeLock,
                                     TRUE);
@@ -465,7 +450,7 @@ AFSEnumerateDirectory( IN GUID *AuthGroup,
                         pDirNode->Type.Data.ShortNameTreeEntry.HashIndex = AFSGenerateCRC( &uniShortName,
                                                                                            TRUE);
 
-                        AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                        AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                       AFS_TRACE_LEVEL_VERBOSE,
                                       "AFSEnumerateDirectory Initialized short name %wZ for DE %p for %wZ FID %08lX-%08lX-%08lX-%08lX\n",
                                       &uniShortName,
@@ -474,7 +459,7 @@ AFSEnumerateDirectory( IN GUID *AuthGroup,
                                       pCurrentDirEntry->FileId.Cell,
                                       pCurrentDirEntry->FileId.Volume,
                                       pCurrentDirEntry->FileId.Vnode,
-                                      pCurrentDirEntry->FileId.Unique);
+                                      pCurrentDirEntry->FileId.Unique));
                     }
                     else
                     {
@@ -503,20 +488,20 @@ AFSEnumerateDirectory( IN GUID *AuthGroup,
 
                     ObjectInfoCB->Specific.Directory.DirectoryNodeHdr.CaseSensitiveTreeHead = pDirNode;
 
-                    AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                    AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                   AFS_TRACE_LEVEL_VERBOSE,
                                   "AFSEnumerateDirectory Insert DE %p to head of case sensitive tree for %wZ\n",
                                   pDirNode,
-                                  &pDirNode->NameInformation.FileName);
+                                  &pDirNode->NameInformation.FileName));
                 }
                 else
                 {
 
-                    AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                    AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                   AFS_TRACE_LEVEL_VERBOSE,
                                   "AFSEnumerateDirectory Insert DE %p to case sensitive tree for %wZ\n",
                                   pDirNode,
-                                  &pDirNode->NameInformation.FileName);
+                                  &pDirNode->NameInformation.FileName));
 
                     if( !NT_SUCCESS( AFSInsertCaseSensitiveDirEntry( ObjectInfoCB->Specific.Directory.DirectoryNodeHdr.CaseSensitiveTreeHead,
                                                                      pDirNode)))
@@ -527,7 +512,7 @@ AFSEnumerateDirectory( IN GUID *AuthGroup,
                         //
 
                         AFSDeleteDirEntry( ObjectInfoCB,
-                                           pDirNode);
+                                           &pDirNode);
 
                         pCurrentDirEntry = (AFSDirEnumEntry *)((char *)pCurrentDirEntry + ulEntryLength);
 
@@ -549,11 +534,11 @@ AFSEnumerateDirectory( IN GUID *AuthGroup,
                 if( ObjectInfoCB->Specific.Directory.DirectoryNodeHdr.CaseInsensitiveTreeHead == NULL)
                 {
 
-                    AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                    AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                   AFS_TRACE_LEVEL_VERBOSE,
                                   "AFSEnumerateDirectory Insert DE %p to head of case insensitive tree for %wZ\n",
                                   pDirNode,
-                                  &pDirNode->NameInformation.FileName);
+                                  &pDirNode->NameInformation.FileName));
 
                     ObjectInfoCB->Specific.Directory.DirectoryNodeHdr.CaseInsensitiveTreeHead = pDirNode;
 
@@ -562,11 +547,11 @@ AFSEnumerateDirectory( IN GUID *AuthGroup,
                 else
                 {
 
-                    AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                    AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                   AFS_TRACE_LEVEL_VERBOSE,
                                   "AFSEnumerateDirectory Insert DE %p to case insensitive tree for %wZ\n",
                                   pDirNode,
-                                  &pDirNode->NameInformation.FileName);
+                                  &pDirNode->NameInformation.FileName));
 
                     AFSInsertCaseInsensitiveDirEntry( ObjectInfoCB->Specific.Directory.DirectoryNodeHdr.CaseInsensitiveTreeHead,
                                                       pDirNode);
@@ -591,7 +576,7 @@ AFSEnumerateDirectory( IN GUID *AuthGroup,
 
                 InterlockedIncrement( &ObjectInfoCB->Specific.Directory.DirectoryNodeCount);
 
-                AFSDbgLogMsg( AFS_SUBSYSTEM_DIR_NODE_COUNT,
+                AFSDbgTrace(( AFS_SUBSYSTEM_DIR_NODE_COUNT,
                               AFS_TRACE_LEVEL_VERBOSE,
                               "AFSEnumerateDirectory Adding entry %wZ Inc Count %d to parent FID %08lX-%08lX-%08lX-%08lX\n",
                               &pDirNode->NameInformation.FileName,
@@ -599,7 +584,7 @@ AFSEnumerateDirectory( IN GUID *AuthGroup,
                               ObjectInfoCB->FileId.Cell,
                               ObjectInfoCB->FileId.Volume,
                               ObjectInfoCB->FileId.Vnode,
-                              ObjectInfoCB->FileId.Unique);
+                              ObjectInfoCB->FileId.Unique));
 
                 if( pDirNode->Type.Data.ShortNameTreeEntry.HashIndex != 0)
                 {
@@ -611,11 +596,11 @@ AFSEnumerateDirectory( IN GUID *AuthGroup,
                     if( ObjectInfoCB->Specific.Directory.ShortNameTree == NULL)
                     {
 
-                        AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                        AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                       AFS_TRACE_LEVEL_VERBOSE,
                                       "AFSEnumerateDirectory Insert DE %p to head of shortname tree for %wZ\n",
                                       pDirNode,
-                                      &pDirNode->NameInformation.FileName);
+                                      &pDirNode->NameInformation.FileName));
 
                         ObjectInfoCB->Specific.Directory.ShortNameTree = pDirNode;
 
@@ -629,11 +614,11 @@ AFSEnumerateDirectory( IN GUID *AuthGroup,
                         {
                             SetFlag( pDirNode->Flags, AFS_DIR_ENTRY_INSERTED_SHORT_NAME);
 
-                            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                            AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                           AFS_TRACE_LEVEL_VERBOSE,
                                           "AFSEnumerateDirectory Insert DE %p to shortname tree for %wZ\n",
                                           pDirNode,
-                                          &pDirNode->NameInformation.FileName);
+                                          &pDirNode->NameInformation.FileName));
                         }
                     }
                 }
@@ -663,10 +648,10 @@ AFSEnumerateDirectory( IN GUID *AuthGroup,
 
             pDirQueryCB->EnumHandle = pDirEnumResponse->EnumHandle;
 
-            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+            AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                           AFS_TRACE_LEVEL_VERBOSE,
                           "AFSEnumerateDirectory EnumHandle %08lX\n",
-                          pDirQueryCB->EnumHandle);
+                          pDirQueryCB->EnumHandle));
         }
 
 try_exit:
@@ -681,22 +666,27 @@ try_exit:
             AFSExFreePoolWithTag( pBuffer, AFS_DIR_BUFFER_TAG);
         }
 
-        //
-        // If the processing failed then we should reset the directory content in the event
-        // it is re-enumerated
-        //
+        if ( NT_SUCCESS( ntStatus))
+        {
 
-        if( !NT_SUCCESS( ntStatus))
+            SetFlag( ObjectInfoCB->Flags, AFS_OBJECT_FLAGS_DIRECTORY_ENUMERATED);
+        }
+        else
         {
 
-            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+            //
+            // If the processing failed then we should reset the directory
+            // content in the event it is re-enumerated
+            //
+
+            AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                           AFS_TRACE_LEVEL_ERROR,
                           "AFSEnumerateDirectory Resetting content for FID %08lX-%08lX-%08lX-%08lX Status %08lX\n",
                           ObjectInfoCB->FileId.Cell,
                           ObjectInfoCB->FileId.Volume,
                           ObjectInfoCB->FileId.Vnode,
                           ObjectInfoCB->FileId.Unique,
-                          ntStatus);
+                          ntStatus));
 
             AFSResetDirectoryContent( ObjectInfoCB);
         }
@@ -728,6 +718,8 @@ AFSEnumerateDirectoryNoResponse( IN GUID *AuthGroup,
                                       AuthGroup,
                                       NULL,
                                       FileId,
+                                      NULL,
+                                      0,
                                       (void *)&stDirQueryCB,
                                       sizeof( AFSDirQueryCB),
                                       NULL,
@@ -745,10 +737,10 @@ AFSEnumerateDirectoryNoResponse( IN GUID *AuthGroup,
             else
             {
 
-                AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                               AFS_TRACE_LEVEL_ERROR,
                               "AFSEnumerateDirectoryNoResponse Failed to enumerate directory Status %08lX\n",
-                              ntStatus);
+                              ntStatus));
             }
         }
     }
@@ -793,14 +785,14 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB,
                                &uniGUID);
         }
 
-        AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+        AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                       AFS_TRACE_LEVEL_VERBOSE,
                       "AFSVerifyDirectoryContent Verifying content for FID %08lX-%08lX-%08lX-%08lX AuthGroup %wZ\n",
                       ObjectInfoCB->FileId.Cell,
                       ObjectInfoCB->FileId.Volume,
                       ObjectInfoCB->FileId.Vnode,
                       ObjectInfoCB->FileId.Unique,
-                      &uniGUID);
+                      &uniGUID));
 
         if( AuthGroup != NULL)
         {
@@ -811,9 +803,9 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB,
         // Initialize the directory enumeration buffer for the directory
         //
 
-        pBuffer = AFSExAllocatePoolWithTag( PagedPool,
-                                            AFS_DIR_ENUM_BUFFER_LEN,
-                                            AFS_DIR_BUFFER_TAG);
+       pBuffer = AFSLibExAllocatePoolWithTag( PagedPool,
+                                              AFS_DIR_ENUM_BUFFER_LEN,
+                                              AFS_DIR_BUFFER_TAG);
 
         if( pBuffer == NULL)
         {
@@ -862,6 +854,8 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB,
                                               AuthGroup,
                                               NULL,
                                               &ObjectInfoCB->FileId,
+                                              ObjectInfoCB->VolumeCB->VolumeInformation.Cell,
+                                              ObjectInfoCB->VolumeCB->VolumeInformation.CellLength,
                                               (void *)pDirQueryCB,
                                               sizeof( AFSDirQueryCB),
                                               pBuffer,
@@ -881,7 +875,7 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB,
                     AFSAcquireExcl( ObjectInfoCB->Specific.Directory.DirectoryNodeHdr.TreeLock,
                                     TRUE);
 
-                    AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                    AFSDbgTrace(( 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,
@@ -892,7 +886,7 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB,
                                   pDirEnumResponse->SnapshotDataVersion.LowPart,
                                   pDirEnumResponse->CurrentDataVersion.HighPart,
                                   pDirEnumResponse->CurrentDataVersion.LowPart,
-                                  ntStatus);
+                                  ntStatus));
 
                     ntStatus = STATUS_SUCCESS;
 
@@ -903,13 +897,13 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB,
 
                         ObjectInfoCB->DataVersion.QuadPart = (ULONGLONG)-1;
 
-                        AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                        AFSDbgTrace(( 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);
+                                      ObjectInfoCB->FileId.Unique));
                     }
                     else
                     {
@@ -922,7 +916,7 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB,
                 else
                 {
 
-                    AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                    AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                   AFS_TRACE_LEVEL_ERROR,
                                   "AFSVerifyDirectoryContent Failed to enumerate directory FID %08lX-%08lX-%08lX-%08lX AuthGroup %wZ Status %08lX\n",
                                   ObjectInfoCB->FileId.Cell,
@@ -930,7 +924,7 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB,
                                   ObjectInfoCB->FileId.Vnode,
                                   ObjectInfoCB->FileId.Unique,
                                   &uniGUID,
-                                  ntStatus);
+                                  ntStatus));
                 }
 
                 break;
@@ -940,7 +934,7 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB,
 
             pCurrentDirEntry = (AFSDirEnumEntry *)pDirEnumResponse->Entry;
 
-            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+            AFSDbgTrace(( 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,
@@ -950,7 +944,7 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB,
                           pDirEnumResponse->SnapshotDataVersion.HighPart,
                           pDirEnumResponse->SnapshotDataVersion.LowPart,
                           pDirEnumResponse->CurrentDataVersion.HighPart,
-                          pDirEnumResponse->CurrentDataVersion.LowPart);
+                          pDirEnumResponse->CurrentDataVersion.LowPart));
 
             //
             // Remove the leading header from the processed length
@@ -1023,10 +1017,12 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB,
 
                         SetFlag( pDirNode->Flags, AFS_DIR_ENTRY_VALID);
 
+                        KeQueryTickCount( &ObjectInfoCB->LastAccessCount);
+
                         if( pCurrentDirEntry->ShortNameLength > 0 &&
                             pDirNode->NameInformation.ShortNameLength > 0)
                         {
-                            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                            AFSDbgTrace(( 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,
@@ -1036,13 +1032,13 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB,
                                           ObjectInfoCB->FileId.Vnode,
                                           ObjectInfoCB->FileId.Unique,
                                           pDirNode->NameInformation.ShortName,
-                                          pCurrentDirEntry->ShortName);
+                                          pCurrentDirEntry->ShortName));
                         }
                         else if( pCurrentDirEntry->ShortNameLength == 0 &&
                                  pDirNode->NameInformation.ShortNameLength > 0)
                         {
 
-                            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                            AFSDbgTrace(( 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 NULL\n",
                                           &uniDirName,
@@ -1051,12 +1047,12 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB,
                                           ObjectInfoCB->FileId.Volume,
                                           ObjectInfoCB->FileId.Vnode,
                                           ObjectInfoCB->FileId.Unique,
-                                          pDirNode->NameInformation.ShortName);
+                                          pDirNode->NameInformation.ShortName));
                         }
                         else if( pCurrentDirEntry->ShortNameLength > 0 &&
                                  pDirNode->NameInformation.ShortNameLength == 0)
                         {
-                            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                            AFSDbgTrace(( 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,
@@ -1065,11 +1061,11 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB,
                                           ObjectInfoCB->FileId.Volume,
                                           ObjectInfoCB->FileId.Vnode,
                                           ObjectInfoCB->FileId.Unique,
-                                          pCurrentDirEntry->ShortName);
+                                          pCurrentDirEntry->ShortName));
                         }
                         else
                         {
-                            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                            AFSDbgTrace(( 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,
@@ -1077,7 +1073,7 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB,
                                           ObjectInfoCB->FileId.Cell,
                                           ObjectInfoCB->FileId.Volume,
                                           ObjectInfoCB->FileId.Vnode,
-                                          ObjectInfoCB->FileId.Unique);
+                                          ObjectInfoCB->FileId.Unique));
                         }
 
                         //
@@ -1087,42 +1083,6 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB,
                         if( pObjectInfo->DataVersion.QuadPart != pCurrentDirEntry->DataVersion.QuadPart)
                         {
 
-                            //
-                            // The ObjectReferenceCount will be freed by AFSPerformObjectInvalidate
-                            // if successfully queued.  Cannot call AFSPerformObjectInvalidate directly
-                            // because ObjectInfoCB->Specific.Directory.DirectoryNodeHdr.TreeLock is
-                            // held during the sequence AFSVerifyEntry->AFSValidateDirectoryCache->
-                            // AFSVerifyDirectoryContent and AFSPerformObjectInvalidate requires the
-                            // Fcb->NPFcb->Resource which must be held prior to the TreeLock in the
-                            // lock hierarchy.
-                            //
-
-                            lCount = AFSObjectInfoIncrement( pObjectInfo,
-                                                             AFS_OBJECT_REFERENCE_INVALIDATION);
-
-                            AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING,
-                                          AFS_TRACE_LEVEL_VERBOSE,
-                                          "AFSVerifyDirectoryContent calling AFSQueueInvalidateObject Increment count on object %p Cnt %d\n",
-                                          pObjectInfo,
-                                          lCount);
-
-                            if ( !NT_SUCCESS( AFSQueueInvalidateObject( pObjectInfo,
-                                                                        AFS_INVALIDATE_DATA_VERSION)))
-                            {
-
-                                lCount = AFSObjectInfoDecrement( pObjectInfo,
-                                                                 AFS_OBJECT_REFERENCE_INVALIDATION);
-
-                                AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING,
-                                              AFS_TRACE_LEVEL_VERBOSE,
-                                              "AFSVerifyDirectoryContent AFSQueueInvalidateObject failed Decrement count on object %p Cnt %d\n",
-                                              pObjectInfo,
-                                              lCount);
-                            }
-                        }
-                        else
-                        {
-
                             AFSUpdateMetaData( pDirNode,
                                                pCurrentDirEntry);
                         }
@@ -1152,7 +1112,7 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB,
                     // File name matches but FileID does not.
                     //
 
-                    AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                    AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                   AFS_TRACE_LEVEL_VERBOSE,
                                   "AFSVerifyDirectoryContent Processing dir entry %p %wZ with different FID, same name in parent FID %08lX-%08lX-%08lX-%08lX\n",
                                   pDirNode,
@@ -1160,16 +1120,17 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB,
                                   ObjectInfoCB->FileId.Cell,
                                   ObjectInfoCB->FileId.Volume,
                                   ObjectInfoCB->FileId.Vnode,
-                                  ObjectInfoCB->FileId.Unique);
+                                  ObjectInfoCB->FileId.Unique));
 
                     //
                     // Need to tear down this entry and rebuild it below
                     //
 
-                    if( pDirNode->DirOpenReferenceCount <= 0)
+                    if( pDirNode->DirOpenReferenceCount <= 0 &&
+                        pDirNode->NameArrayReferenceCount <= 0)
                     {
 
-                        AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                        AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                       AFS_TRACE_LEVEL_VERBOSE,
                                       "AFSVerifyDirectoryContent Different FIDs - Deleting DE %p for %wZ Old FID %08lX-%08lX-%08lX-%08lX New FID %08lX-%08lX-%08lX-%08lX\n",
                                       pDirNode,
@@ -1181,17 +1142,17 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB,
                                       pCurrentDirEntry->FileId.Cell,
                                       pCurrentDirEntry->FileId.Volume,
                                       pCurrentDirEntry->FileId.Vnode,
-                                      pCurrentDirEntry->FileId.Unique);
+                                      pCurrentDirEntry->FileId.Unique));
 
                         AFSDeleteDirEntry( ObjectInfoCB,
-                                           pDirNode);
+                                           &pDirNode);
                     }
                     else
                     {
 
                         SetFlag( pDirNode->Flags, AFS_DIR_ENTRY_DELETED);
 
-                        AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                        AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                       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,
@@ -1203,7 +1164,7 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB,
                                       pCurrentDirEntry->FileId.Cell,
                                       pCurrentDirEntry->FileId.Volume,
                                       pCurrentDirEntry->FileId.Vnode,
-                                      pCurrentDirEntry->FileId.Unique);
+                                      pCurrentDirEntry->FileId.Unique));
 
                         AFSRemoveNameEntry( ObjectInfoCB,
                                             pDirNode);
@@ -1212,14 +1173,14 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB,
                 else
                 {
 
-                    AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                    AFSDbgTrace(( 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);
+                                  ObjectInfoCB->FileId.Unique));
                 }
 
                 pDirNode = AFSInitDirEntry( ObjectInfoCB,
@@ -1242,14 +1203,14 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB,
                 if( pDirNode->ObjectInformation->FileType == AFS_FILE_TYPE_DIRECTORY)
                 {
 
-                    AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                    AFSDbgTrace(( 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);
+                                  pDirNode->ObjectInformation->FileId.Unique));
 
                     AFSAcquireExcl( pDirNode->ObjectInformation->Specific.Directory.DirectoryNodeHdr.TreeLock,
                                     TRUE);
@@ -1293,7 +1254,7 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB,
                         pDirNode->Type.Data.ShortNameTreeEntry.HashIndex = AFSGenerateCRC( &uniShortName,
                                                                                            TRUE);
 
-                        AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                        AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                       AFS_TRACE_LEVEL_VERBOSE,
                                       "AFSVerifyDirectoryContent Initialized short name %wZ for DE %p for %wZ FID %08lX-%08lX-%08lX-%08lX\n",
                                       &uniShortName,
@@ -1302,7 +1263,7 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB,
                                       pCurrentDirEntry->FileId.Cell,
                                       pCurrentDirEntry->FileId.Volume,
                                       pCurrentDirEntry->FileId.Vnode,
-                                      pCurrentDirEntry->FileId.Unique);
+                                      pCurrentDirEntry->FileId.Unique));
                     }
                     else
                     {
@@ -1333,11 +1294,11 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB,
 
                     ObjectInfoCB->Specific.Directory.DirectoryNodeHdr.CaseSensitiveTreeHead = pDirNode;
 
-                    AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                    AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                   AFS_TRACE_LEVEL_VERBOSE,
                                   "AFSVerifyDirectoryContent Insert DE %p to head of case sensitive tree for %wZ\n",
                                   pDirNode,
-                                  &pDirNode->NameInformation.FileName);
+                                  &pDirNode->NameInformation.FileName));
                 }
                 else
                 {
@@ -1345,18 +1306,18 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB,
                     if( !NT_SUCCESS( AFSInsertCaseSensitiveDirEntry( ObjectInfoCB->Specific.Directory.DirectoryNodeHdr.CaseSensitiveTreeHead,
                                                                      pDirNode)))
                     {
-                        AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                        AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                       AFS_TRACE_LEVEL_VERBOSE,
                                       "AFSVerifyDirectoryContent Failed to insert DE %p to case sensitive tree for %wZ\n",
                                       pDirNode,
-                                      &pDirNode->NameInformation.FileName);
+                                      &pDirNode->NameInformation.FileName));
 
                         //
                         // Delete this dir entry and continue on
                         //
 
                         AFSDeleteDirEntry( ObjectInfoCB,
-                                           pDirNode);
+                                           &pDirNode);
 
                         pCurrentDirEntry = (AFSDirEnumEntry *)((char *)pCurrentDirEntry + ulEntryLength);
 
@@ -1373,11 +1334,11 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB,
                     }
                     else
                     {
-                        AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                        AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                       AFS_TRACE_LEVEL_VERBOSE,
                                       "AFSVerifyDirectoryContent Insert DE %p to case sensitive tree for %wZ\n",
                                       pDirNode,
-                                      &pDirNode->NameInformation.FileName);
+                                      &pDirNode->NameInformation.FileName));
                     }
                 }
 
@@ -1390,11 +1351,11 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB,
 
                     SetFlag( pDirNode->Flags, AFS_DIR_ENTRY_CASE_INSENSTIVE_LIST_HEAD);
 
-                    AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                    AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                   AFS_TRACE_LEVEL_VERBOSE,
                                   "AFSVerifyDirectoryContent Insert DE %p to head of case insensitive tree for %wZ\n",
                                   pDirNode,
-                                  &pDirNode->NameInformation.FileName);
+                                  &pDirNode->NameInformation.FileName));
                 }
                 else
                 {
@@ -1402,11 +1363,11 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB,
                     AFSInsertCaseInsensitiveDirEntry( ObjectInfoCB->Specific.Directory.DirectoryNodeHdr.CaseInsensitiveTreeHead,
                                                       pDirNode);
 
-                    AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                    AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                   AFS_TRACE_LEVEL_VERBOSE,
                                   "AFSVerifyDirectoryContent Insert DE %p to case insensitive tree for %wZ\n",
                                   pDirNode,
-                                  &pDirNode->NameInformation.FileName);
+                                  &pDirNode->NameInformation.FileName));
                 }
 
                 if( ObjectInfoCB->Specific.Directory.DirectoryNodeListHead == NULL)
@@ -1428,7 +1389,7 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB,
 
                 InterlockedIncrement( &ObjectInfoCB->Specific.Directory.DirectoryNodeCount);
 
-                AFSDbgLogMsg( AFS_SUBSYSTEM_DIR_NODE_COUNT,
+                AFSDbgTrace(( AFS_SUBSYSTEM_DIR_NODE_COUNT,
                               AFS_TRACE_LEVEL_VERBOSE,
                               "AFSVerifyDirectoryContent Adding entry %wZ Inc Count %d to parent FID %08lX-%08lX-%08lX-%08lX\n",
                               &pDirNode->NameInformation.FileName,
@@ -1436,7 +1397,7 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB,
                               ObjectInfoCB->FileId.Cell,
                               ObjectInfoCB->FileId.Volume,
                               ObjectInfoCB->FileId.Vnode,
-                              ObjectInfoCB->FileId.Unique);
+                              ObjectInfoCB->FileId.Unique));
 
                 if( pDirNode->Type.Data.ShortNameTreeEntry.HashIndex != 0)
                 {
@@ -1450,11 +1411,11 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB,
 
                         ObjectInfoCB->Specific.Directory.ShortNameTree = pDirNode;
 
-                        AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                        AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                       AFS_TRACE_LEVEL_VERBOSE,
                                       "AFSVerifyDirectoryContent Insert DE %p to head of shortname tree for %wZ\n",
                                       pDirNode,
-                                      &pDirNode->NameInformation.FileName);
+                                      &pDirNode->NameInformation.FileName));
 
                         SetFlag( pDirNode->Flags, AFS_DIR_ENTRY_INSERTED_SHORT_NAME);
                     }
@@ -1464,22 +1425,22 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB,
                         if( !NT_SUCCESS( AFSInsertShortNameDirEntry( ObjectInfoCB->Specific.Directory.ShortNameTree,
                                                                      pDirNode)))
                         {
-                            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                            AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                           AFS_TRACE_LEVEL_VERBOSE,
                                           "AFSVerifyDirectoryContent Failed to insert DE %p (%08lX) to shortname tree for %wZ\n",
                                           pDirNode,
                                           pDirNode->Type.Data.ShortNameTreeEntry.HashIndex,
-                                          &pDirNode->NameInformation.FileName);
+                                          &pDirNode->NameInformation.FileName));
                         }
                         else
                         {
                             SetFlag( pDirNode->Flags, AFS_DIR_ENTRY_INSERTED_SHORT_NAME);
 
-                            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                            AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                           AFS_TRACE_LEVEL_VERBOSE,
                                           "AFSVerifyDirectoryContent Insert DE %p to shortname tree for %wZ\n",
                                           pDirNode,
-                                          &pDirNode->NameInformation.FileName);
+                                          &pDirNode->NameInformation.FileName));
                         }
                     }
                 }
@@ -1575,9 +1536,9 @@ AFSNotifyFileCreate( IN GUID            *AuthGroup,
         // Allocate our return buffer
         //
 
-        pResultCB = (AFSFileCreateResultCB *)AFSExAllocatePoolWithTag( PagedPool,
-                                                                       PAGE_SIZE,
-                                                                       AFS_GENERIC_MEMORY_1_TAG);
+       pResultCB = (AFSFileCreateResultCB *)AFSLibExAllocatePoolWithTag( PagedPool,
+                                                                         PAGE_SIZE,
+                                                                         AFS_GENERIC_MEMORY_1_TAG);
 
         if( pResultCB == NULL)
         {
@@ -1599,6 +1560,8 @@ AFSNotifyFileCreate( IN GUID            *AuthGroup,
                                       AuthGroup,
                                       FileName,
                                       NULL,
+                                      NULL,
+                                      0,
                                       &stCreateCB,
                                       sizeof( AFSFileCreateCB),
                                       pResultCB,
@@ -1631,7 +1594,7 @@ AFSNotifyFileCreate( IN GUID            *AuthGroup,
         if( ParentObjectInfo->DataVersion.QuadPart != pResultCB->ParentDataVersion.QuadPart - 1)
         {
 
-            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+            AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                           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,
@@ -1642,7 +1605,7 @@ AFSNotifyFileCreate( IN GUID            *AuthGroup,
                           ParentObjectInfo->DataVersion.HighPart,
                           ParentObjectInfo->DataVersion.LowPart,
                           pResultCB->ParentDataVersion.HighPart,
-                          pResultCB->ParentDataVersion.LowPart);
+                          pResultCB->ParentDataVersion.LowPart));
 
             //
             // We raced so go and lookup the directory entry in the parent
@@ -1658,11 +1621,11 @@ AFSNotifyFileCreate( IN GUID            *AuthGroup,
             if( pDirNode != NULL)
             {
 
-                AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                               AFS_TRACE_LEVEL_VERBOSE,
                               "AFSNotifyFileCreate Located dir entry %p for file %wZ\n",
                               pDirNode,
-                              FileName);
+                              FileName));
 
                 if ( AFSIsEqualFID( &pDirNode->ObjectInformation->FileId,
                                     &pResultCB->DirEnum.FileId))
@@ -1680,7 +1643,7 @@ AFSNotifyFileCreate( IN GUID            *AuthGroup,
                     // same as the one that was created for us by the file server.
                     //
 
-                    AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                    AFSDbgTrace(( 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,
@@ -1692,12 +1655,13 @@ AFSNotifyFileCreate( IN GUID            *AuthGroup,
                                   pResultCB->DirEnum.FileId.Cell,
                                   pResultCB->DirEnum.FileId.Volume,
                                   pResultCB->DirEnum.FileId.Vnode,
-                                  pResultCB->DirEnum.FileId.Unique);
+                                  pResultCB->DirEnum.FileId.Unique));
 
-                    if( pDirNode->DirOpenReferenceCount <= 0)
+                    if( pDirNode->DirOpenReferenceCount <= 0 &&
+                        pDirNode->NameArrayReferenceCount <= 0)
                     {
 
-                        AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                        AFSDbgTrace(( 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,
@@ -1709,17 +1673,17 @@ AFSNotifyFileCreate( IN GUID            *AuthGroup,
                                       pResultCB->DirEnum.FileId.Cell,
                                       pResultCB->DirEnum.FileId.Volume,
                                       pResultCB->DirEnum.FileId.Vnode,
-                                      pResultCB->DirEnum.FileId.Unique);
+                                      pResultCB->DirEnum.FileId.Unique));
 
                         AFSDeleteDirEntry( ParentObjectInfo,
-                                           pDirNode);
+                                           &pDirNode);
                     }
                     else
                     {
 
                         SetFlag( pDirNode->Flags, AFS_DIR_ENTRY_DELETED);
 
-                        AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                        AFSDbgTrace(( 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,
@@ -1731,7 +1695,7 @@ AFSNotifyFileCreate( IN GUID            *AuthGroup,
                                       pResultCB->DirEnum.FileId.Cell,
                                       pResultCB->DirEnum.FileId.Volume,
                                       pResultCB->DirEnum.FileId.Vnode,
-                                      pResultCB->DirEnum.FileId.Unique);
+                                      pResultCB->DirEnum.FileId.Unique));
 
                         AFSRemoveNameEntry( ParentObjectInfo,
                                             pDirNode);
@@ -1751,10 +1715,10 @@ AFSNotifyFileCreate( IN GUID            *AuthGroup,
             ParentObjectInfo->DataVersion.QuadPart = (ULONGLONG)-1;
         }
 
-        AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+        AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                       AFS_TRACE_LEVEL_VERBOSE,
                       "AFSNotifyFileCreate Creating new entry %wZ\n",
-                      FileName);
+                      FileName));
 
         //
         // Initialize the directory entry
@@ -1808,12 +1772,12 @@ AFSNotifyFileCreate( IN GUID            *AuthGroup,
             pDirNode->Type.Data.ShortNameTreeEntry.HashIndex = AFSGenerateCRC( &uniShortName,
                                                                                TRUE);
 
-            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+            AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                           AFS_TRACE_LEVEL_VERBOSE,
                           "AFSNotifyFileCreate Initialized short name %wZ for DE %p for %wZ\n",
                           &uniShortName,
                           pDirNode,
-                          &pDirNode->NameInformation.FileName);
+                          &pDirNode->NameInformation.FileName));
         }
         else
         {
@@ -1833,7 +1797,7 @@ AFSNotifyFileCreate( IN GUID            *AuthGroup,
 
             ParentObjectInfo->DataVersion = pResultCB->ParentDataVersion;
 
-            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+            AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                           AFS_TRACE_LEVEL_VERBOSE,
                           "AFSNotifyFileCreate entry %wZ ParentFID %08lX-%08lX-%08lX-%08lX Version %08lX:%08lX\n",
                           FileName,
@@ -1841,7 +1805,7 @@ AFSNotifyFileCreate( IN GUID            *AuthGroup,
                           ParentObjectInfo->FileId.Volume,
                           ParentObjectInfo->FileId.Vnode,
                           ParentObjectInfo->FileId.Unique,
-                          ParentObjectInfo->DataVersion.QuadPart);
+                          ParentObjectInfo->DataVersion.QuadPart));
         }
 
         //
@@ -1857,12 +1821,12 @@ try_exit:
 
             lCount = InterlockedIncrement( &(*DirNode)->DirOpenReferenceCount);
 
-            AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
+            AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
                           AFS_TRACE_LEVEL_VERBOSE,
                           "AFSNotifyFileCreate Increment count on %wZ DE %p Cnt %d\n",
                           &(*DirNode)->NameInformation.FileName,
                           *DirNode,
-                          lCount);
+                          lCount));
 
             ASSERT( lCount >= 0);
         }
@@ -1920,9 +1884,9 @@ AFSUpdateFileInformation( IN AFSFileID *ParentFid,
 
         stUpdateCB.LastWriteTime = ObjectInfo->LastWriteTime;
 
-        pUpdateResultCB = (AFSFileUpdateResultCB *)AFSExAllocatePoolWithTag( PagedPool,
-                                                                             PAGE_SIZE,
-                                                                             AFS_UPDATE_RESULT_TAG);
+       pUpdateResultCB = (AFSFileUpdateResultCB *)AFSLibExAllocatePoolWithTag( PagedPool,
+                                                                               PAGE_SIZE,
+                                                                               AFS_UPDATE_RESULT_TAG);
 
         if( pUpdateResultCB == NULL)
         {
@@ -1937,6 +1901,8 @@ AFSUpdateFileInformation( IN AFSFileID *ParentFid,
                                       AuthGroup,
                                       NULL,
                                       &ObjectInfo->FileId,
+                                      ObjectInfo->VolumeCB->VolumeInformation.Cell,
+                                      ObjectInfo->VolumeCB->VolumeInformation.CellLength,
                                       &stUpdateCB,
                                       sizeof( AFSFileUpdateCB),
                                       pUpdateResultCB,
@@ -1945,14 +1911,14 @@ AFSUpdateFileInformation( IN AFSFileID *ParentFid,
         if( ntStatus != STATUS_SUCCESS)
         {
 
-            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+            AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                           AFS_TRACE_LEVEL_ERROR,
                           "AFSUpdateFileInformation failed FID %08lX-%08lX-%08lX-%08lX Status %08lX\n",
                           ObjectInfo->FileId.Cell,
                           ObjectInfo->FileId.Volume,
                           ObjectInfo->FileId.Vnode,
                           ObjectInfo->FileId.Unique,
-                          ntStatus);
+                          ntStatus));
 
             try_return( ntStatus);
         }
@@ -1994,11 +1960,19 @@ AFSNotifyDelete( IN AFSDirectoryCB *DirectoryCB,
     AFSFileDeleteCB stDelete;
     AFSFileDeleteResultCB stDeleteResult;
     ULONG ulRequestFlags = AFS_REQUEST_FLAG_SYNCHRONOUS;
+    AFSObjectInfoCB *pObjectInfo = NULL;
+    AFSObjectInfoCB *pParentObjectInfo = NULL;
 
     __Enter
     {
 
-        stDelete.ParentId = DirectoryCB->ObjectInformation->ParentObjectInformation->FileId;
+        pObjectInfo = DirectoryCB->ObjectInformation;
+
+        pParentObjectInfo = AFSFindObjectInfo( pObjectInfo->VolumeCB,
+                                               &pObjectInfo->ParentFileId,
+                                               FALSE);
+
+        stDelete.ParentId = pObjectInfo->ParentFileId;
 
         stDelete.ProcessId = (ULONGLONG)PsGetCurrentProcessId();
 
@@ -2013,7 +1987,9 @@ AFSNotifyDelete( IN AFSDirectoryCB *DirectoryCB,
                                       ulRequestFlags,
                                       AuthGroup,
                                       &DirectoryCB->NameInformation.FileName,
-                                      &DirectoryCB->ObjectInformation->FileId,
+                                      &pObjectInfo->FileId,
+                                      pObjectInfo->VolumeCB->VolumeInformation.Cell,
+                                      pObjectInfo->VolumeCB->VolumeInformation.CellLength,
                                       &stDelete,
                                       sizeof( AFSFileDeleteCB),
                                       &stDeleteResult,
@@ -2022,7 +1998,7 @@ AFSNotifyDelete( IN AFSDirectoryCB *DirectoryCB,
         if( ntStatus != STATUS_SUCCESS)
         {
 
-            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+            AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                           AFS_TRACE_LEVEL_ERROR,
                           "AFSNotifyDelete failed ParentFID %08lX-%08lX-%08lX-%08lX %wZ FID %08lX-%08lX-%08lX-%08lX Status %08lX\n",
                           stDelete.ParentId.Cell,
@@ -2030,16 +2006,16 @@ AFSNotifyDelete( IN AFSDirectoryCB *DirectoryCB,
                           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);
+                          pObjectInfo->FileId.Cell,
+                          pObjectInfo->FileId.Volume,
+                          pObjectInfo->FileId.Vnode,
+                          pObjectInfo->FileId.Unique,
+                          ntStatus));
 
             try_return( ntStatus);
         }
 
-        AFSAcquireExcl( DirectoryCB->ObjectInformation->Specific.Directory.DirectoryNodeHdr.TreeLock,
+        AFSAcquireExcl( pObjectInfo->Specific.Directory.DirectoryNodeHdr.TreeLock,
                         TRUE);
 
         if( CheckOnly)
@@ -2049,12 +2025,12 @@ AFSNotifyDelete( IN AFSDirectoryCB *DirectoryCB,
             // Validate the parent data version
             //
 
-            if( DirectoryCB->ObjectInformation->ParentObjectInformation->DataVersion.QuadPart != stDeleteResult.ParentDataVersion.QuadPart)
+            if( pParentObjectInfo->DataVersion.QuadPart != stDeleteResult.ParentDataVersion.QuadPart)
             {
 
-                SetFlag( DirectoryCB->ObjectInformation->ParentObjectInformation->Flags, AFS_OBJECT_FLAGS_VERIFY);
+                SetFlag( pParentObjectInfo->Flags, AFS_OBJECT_FLAGS_VERIFY);
 
-                DirectoryCB->ObjectInformation->ParentObjectInformation->DataVersion.QuadPart = (ULONGLONG)-1;
+                pParentObjectInfo->DataVersion.QuadPart = (ULONGLONG)-1;
             }
         }
         else
@@ -2064,12 +2040,12 @@ AFSNotifyDelete( IN AFSDirectoryCB *DirectoryCB,
             // Update the parent data version
             //
 
-            if( DirectoryCB->ObjectInformation->ParentObjectInformation->DataVersion.QuadPart != stDeleteResult.ParentDataVersion.QuadPart - 1)
+            if( pParentObjectInfo->DataVersion.QuadPart != stDeleteResult.ParentDataVersion.QuadPart - 1)
             {
 
-                SetFlag( DirectoryCB->ObjectInformation->ParentObjectInformation->Flags, AFS_OBJECT_FLAGS_VERIFY);
+                SetFlag( pParentObjectInfo->Flags, AFS_OBJECT_FLAGS_VERIFY);
 
-                DirectoryCB->ObjectInformation->ParentObjectInformation->DataVersion.QuadPart = (ULONGLONG)-1;
+                pParentObjectInfo->DataVersion.QuadPart = (ULONGLONG)-1;
             }
             else
             {
@@ -2079,20 +2055,24 @@ AFSNotifyDelete( IN AFSDirectoryCB *DirectoryCB,
                 // Directory data version number can be updated.  Until then we must force
                 // a verification.
                 //
-                // DirectoryCB->ObjectInformation->ParentObjectInformation->DataVersion.QuadPart = stDeleteResult.ParentDataVersion.QuadPart;
+                // pParentObjectInfor->DataVersion.QuadPart = stDeleteResult.ParentDataVersion.QuadPart;
                 //
 
-                SetFlag( DirectoryCB->ObjectInformation->ParentObjectInformation->Flags, AFS_OBJECT_FLAGS_VERIFY);
+                SetFlag( pParentObjectInfo->Flags, AFS_OBJECT_FLAGS_VERIFY);
 
-                DirectoryCB->ObjectInformation->ParentObjectInformation->DataVersion.QuadPart = (ULONGLONG)-1;
+                pParentObjectInfo->DataVersion.QuadPart = (ULONGLONG)-1;
             }
         }
 
-        AFSReleaseResource( DirectoryCB->ObjectInformation->Specific.Directory.DirectoryNodeHdr.TreeLock);
+        AFSReleaseResource( pObjectInfo->Specific.Directory.DirectoryNodeHdr.TreeLock);
 
 try_exit:
 
-        NOTHING;
+        if ( pParentObjectInfo)
+        {
+
+            AFSReleaseObjectInfo( &pParentObjectInfo);
+        }
     }
 
     return ntStatus;
@@ -2127,9 +2107,9 @@ AFSNotifyHardLink( IN AFSObjectInfoCB *ObjectInfo,
         // Init the control block for the request
         //
 
-        pHardLinkCB = (AFSFileHardLinkCB *)AFSExAllocatePoolWithTag( PagedPool,
-                                                                     PAGE_SIZE,
-                                                                     AFS_HARDLINK_REQUEST_TAG);
+       pHardLinkCB = (AFSFileHardLinkCB *)AFSLibExAllocatePoolWithTag( PagedPool,
+                                                                       PAGE_SIZE,
+                                                                       AFS_HARDLINK_REQUEST_TAG);
 
         if( pHardLinkCB == NULL)
         {
@@ -2165,6 +2145,8 @@ AFSNotifyHardLink( IN AFSObjectInfoCB *ObjectInfo,
                                       AuthGroup,
                                       &SourceDirectoryCB->NameInformation.FileName,
                                       &ObjectInfo->FileId,
+                                      ObjectInfo->VolumeCB->VolumeInformation.Cell,
+                                      ObjectInfo->VolumeCB->VolumeInformation.CellLength,
                                       pHardLinkCB,
                                       sizeof( AFSFileHardLinkCB) + TargetName->Length,
                                       pResultCB,
@@ -2173,14 +2155,14 @@ AFSNotifyHardLink( IN AFSObjectInfoCB *ObjectInfo,
         if( ntStatus != STATUS_SUCCESS)
         {
 
-            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+            AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                           AFS_TRACE_LEVEL_ERROR,
                           "AFSNotifyHardLink failed FID %08lX-%08lX-%08lX-%08lX Status %08lX\n",
                           ObjectInfo->FileId.Cell,
                           ObjectInfo->FileId.Volume,
                           ObjectInfo->FileId.Vnode,
                           ObjectInfo->FileId.Unique,
-                          ntStatus);
+                          ntStatus));
 
             try_return( ntStatus);
         }
@@ -2224,7 +2206,7 @@ AFSNotifyHardLink( IN AFSObjectInfoCB *ObjectInfo,
         else
         {
 
-            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+            AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                           AFS_TRACE_LEVEL_WARNING,
                           "AFSNotifyHardLink Raced with an invalidate call and a re-enumeration for entry %wZ ParentFID %08lX-%08lX-%08lX-%08lX Version (%08lX:%08lX != %08lX:%08lX - 1)\n",
                           TargetName,
@@ -2235,7 +2217,7 @@ AFSNotifyHardLink( IN AFSObjectInfoCB *ObjectInfo,
                           TargetParentObjectInfo->DataVersion.HighPart,
                           TargetParentObjectInfo->DataVersion.LowPart,
                           pResultCB->TargetParentDataVersion.HighPart,
-                          pResultCB->TargetParentDataVersion.LowPart);
+                          pResultCB->TargetParentDataVersion.LowPart));
 
             //
             // We raced so go and lookup the directory entry in the parent
@@ -2251,11 +2233,11 @@ AFSNotifyHardLink( IN AFSObjectInfoCB *ObjectInfo,
             if( pDirNode != NULL)
             {
 
-                AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                               AFS_TRACE_LEVEL_VERBOSE,
                               "AFSNotifyHardLink Located dir entry %p for file %wZ\n",
                               pDirNode,
-                              TargetName);
+                              TargetName));
 
                 if ( AFSIsEqualFID( &pDirNode->ObjectInformation->FileId,
                                     &pResultCB->DirEnum.FileId))
@@ -2271,7 +2253,7 @@ AFSNotifyHardLink( IN AFSObjectInfoCB *ObjectInfo,
                     // same as the one that was created for us by the file server.
                     //
 
-                    AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                    AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                   AFS_TRACE_LEVEL_ERROR,
                                   "AFSNotifyHardLink Found matching name entry %wZ DE %p FID %08lX-%08lX-%08lX-%08lX != FID %08lX-%08lX-%08lX-%08lX\n",
                                   TargetName,
@@ -2283,12 +2265,13 @@ AFSNotifyHardLink( IN AFSObjectInfoCB *ObjectInfo,
                                   pResultCB->DirEnum.FileId.Cell,
                                   pResultCB->DirEnum.FileId.Volume,
                                   pResultCB->DirEnum.FileId.Vnode,
-                                  pResultCB->DirEnum.FileId.Unique);
+                                  pResultCB->DirEnum.FileId.Unique));
 
-                    if( pDirNode->DirOpenReferenceCount <= 0)
+                    if( pDirNode->DirOpenReferenceCount <= 0 &&
+                        pDirNode->NameArrayReferenceCount <= 0)
                     {
 
-                        AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                        AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                       AFS_TRACE_LEVEL_VERBOSE,
                                       "AFSNotifyHardLink Different FIDs - Deleting DE %p for %wZ Old FID %08lX-%08lX-%08lX-%08lX New FID %08lX-%08lX-%08lX-%08lX\n",
                                       pDirNode,
@@ -2300,17 +2283,17 @@ AFSNotifyHardLink( IN AFSObjectInfoCB *ObjectInfo,
                                       pResultCB->DirEnum.FileId.Cell,
                                       pResultCB->DirEnum.FileId.Volume,
                                       pResultCB->DirEnum.FileId.Vnode,
-                                      pResultCB->DirEnum.FileId.Unique);
+                                      pResultCB->DirEnum.FileId.Unique));
 
                         AFSDeleteDirEntry( TargetParentObjectInfo,
-                                           pDirNode);
+                                           &pDirNode);
                     }
                     else
                     {
 
                         SetFlag( pDirNode->Flags, AFS_DIR_ENTRY_DELETED);
 
-                        AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                        AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                       AFS_TRACE_LEVEL_VERBOSE,
                                       "AFSNotifyHardLink Different FIDs - Removing DE %p for %wZ Old FID %08lX-%08lX-%08lX-%08lX New FID %08lX-%08lX-%08lX-%08lX\n",
                                       pDirNode,
@@ -2322,7 +2305,7 @@ AFSNotifyHardLink( IN AFSObjectInfoCB *ObjectInfo,
                                       pResultCB->DirEnum.FileId.Cell,
                                       pResultCB->DirEnum.FileId.Volume,
                                       pResultCB->DirEnum.FileId.Vnode,
-                                      pResultCB->DirEnum.FileId.Unique);
+                                      pResultCB->DirEnum.FileId.Unique));
 
                         AFSRemoveNameEntry( TargetParentObjectInfo,
                                             pDirNode);
@@ -2346,10 +2329,10 @@ AFSNotifyHardLink( IN AFSObjectInfoCB *ObjectInfo,
         // Create the hard link entry
         //
 
-        AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+        AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                       AFS_TRACE_LEVEL_VERBOSE,
                       "AFSNotifyHardLink Creating new entry %wZ\n",
-                      TargetName);
+                      TargetName));
 
         //
         // Initialize the directory entry
@@ -2397,12 +2380,12 @@ AFSNotifyHardLink( IN AFSObjectInfoCB *ObjectInfo,
             pDirNode->Type.Data.ShortNameTreeEntry.HashIndex = AFSGenerateCRC( &uniShortName,
                                                                                TRUE);
 
-            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+            AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                           AFS_TRACE_LEVEL_VERBOSE,
                           "AFSNotifyHardLink Initialized short name %wZ for DE %p for %wZ\n",
                           &uniShortName,
                           pDirNode,
-                          &pDirNode->NameInformation.FileName);
+                          &pDirNode->NameInformation.FileName));
         }
         else
         {
@@ -2422,7 +2405,7 @@ AFSNotifyHardLink( IN AFSObjectInfoCB *ObjectInfo,
 
             TargetParentObjectInfo->DataVersion = pResultCB->TargetParentDataVersion;
 
-            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+            AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                           AFS_TRACE_LEVEL_VERBOSE,
                           "AFSNotifyHardLink entry %wZ ParentFID %08lX-%08lX-%08lX-%08lX Version %08lX:%08lX\n",
                           TargetName,
@@ -2430,7 +2413,7 @@ AFSNotifyHardLink( IN AFSObjectInfoCB *ObjectInfo,
                           TargetParentObjectInfo->FileId.Volume,
                           TargetParentObjectInfo->FileId.Vnode,
                           TargetParentObjectInfo->FileId.Unique,
-                          TargetParentObjectInfo->DataVersion.QuadPart);
+                          TargetParentObjectInfo->DataVersion.QuadPart));
         }
 
 try_exit:
@@ -2440,12 +2423,12 @@ try_exit:
 
             lCount = InterlockedIncrement( &pDirNode->DirOpenReferenceCount);
 
-            AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
+            AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
                           AFS_TRACE_LEVEL_VERBOSE,
                           "AFSNotifyHardLink Increment count on %wZ DE %p Cnt %d\n",
                           &pDirNode->NameInformation.FileName,
                           pDirNode,
-                          lCount);
+                          lCount));
 
             ASSERT( lCount >= 0);
 
@@ -2499,9 +2482,9 @@ AFSNotifyRename( IN AFSObjectInfoCB *ObjectInfo,
         // Init the control block for the request
         //
 
-        pRenameCB = (AFSFileRenameCB *)AFSExAllocatePoolWithTag( PagedPool,
-                                                                 PAGE_SIZE,
-                                                                 AFS_RENAME_REQUEST_TAG);
+       pRenameCB = (AFSFileRenameCB *)AFSLibExAllocatePoolWithTag( PagedPool,
+                                                                   PAGE_SIZE,
+                                                                   AFS_RENAME_REQUEST_TAG);
 
         if( pRenameCB == NULL)
         {
@@ -2535,6 +2518,8 @@ AFSNotifyRename( IN AFSObjectInfoCB *ObjectInfo,
                                       AuthGroup,
                                       &DirectoryCB->NameInformation.FileName,
                                       &ObjectInfo->FileId,
+                                      ObjectInfo->VolumeCB->VolumeInformation.Cell,
+                                      ObjectInfo->VolumeCB->VolumeInformation.CellLength,
                                       pRenameCB,
                                       sizeof( AFSFileRenameCB) + TargetName->Length,
                                       pRenameResultCB,
@@ -2543,14 +2528,14 @@ AFSNotifyRename( IN AFSObjectInfoCB *ObjectInfo,
         if( ntStatus != STATUS_SUCCESS)
         {
 
-            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+            AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                           AFS_TRACE_LEVEL_ERROR,
                           "AFSNotifyRename failed FID %08lX-%08lX-%08lX-%08lX Status %08lX\n",
                           ObjectInfo->FileId.Cell,
                           ObjectInfo->FileId.Volume,
                           ObjectInfo->FileId.Vnode,
                           ObjectInfo->FileId.Unique,
-                          ntStatus);
+                          ntStatus));
 
             try_return( ntStatus);
         }
@@ -2611,12 +2596,12 @@ AFSNotifyRename( IN AFSObjectInfoCB *ObjectInfo,
             uniShortName.MaximumLength = uniShortName.Length;
             uniShortName.Buffer = DirectoryCB->NameInformation.ShortName;
 
-            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+            AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                           AFS_TRACE_LEVEL_VERBOSE,
                           "AFSNotifyRename Update old short name %wZ for DE %p for %wZ\n",
                           &uniShortName,
                           DirectoryCB,
-                          &DirectoryCB->NameInformation.FileName);
+                          &DirectoryCB->NameInformation.FileName));
 
             DirectoryCB->NameInformation.ShortNameLength = pRenameResultCB->DirEnum.ShortNameLength;
 
@@ -2628,12 +2613,12 @@ AFSNotifyRename( IN AFSObjectInfoCB *ObjectInfo,
             uniShortName.MaximumLength = uniShortName.Length;
             uniShortName.Buffer = DirectoryCB->NameInformation.ShortName;
 
-            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+            AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                           AFS_TRACE_LEVEL_VERBOSE,
                           "AFSNotifyRename Initialized short name %wZ for DE %p for %wZ\n",
                           &uniShortName,
                           DirectoryCB,
-                          &DirectoryCB->NameInformation.FileName);
+                          &DirectoryCB->NameInformation.FileName));
         }
         else
         {
@@ -2644,12 +2629,12 @@ AFSNotifyRename( IN AFSObjectInfoCB *ObjectInfo,
             uniShortName.MaximumLength = uniShortName.Length;
             uniShortName.Buffer = DirectoryCB->NameInformation.ShortName;
 
-            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+            AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                           AFS_TRACE_LEVEL_VERBOSE,
                           "AFSNotifyRename Removing old short name %wZ for DE %p for %wZ\n",
                           &uniShortName,
                           DirectoryCB,
-                          &DirectoryCB->NameInformation.FileName);
+                          &DirectoryCB->NameInformation.FileName));
 
             DirectoryCB->NameInformation.ShortNameLength = 0;
 
@@ -2694,7 +2679,7 @@ AFSEvaluateTargetByID( IN AFSObjectInfoCB *ObjectInfo,
     AFSFileEvalResultCB *pEvalResultCB = NULL;
     AFSDirEnumEntry *pDirEnumCB = NULL;
     ULONG ulRequestFlags = AFS_REQUEST_FLAG_SYNCHRONOUS;
-    AFSObjectInfoCB *pParentInfo = NULL;
+    AFSObjectInfoCB *pParentObjectInfo = NULL;
 
     __Enter
     {
@@ -2702,21 +2687,23 @@ AFSEvaluateTargetByID( IN AFSObjectInfoCB *ObjectInfo,
         RtlZeroMemory( &stTargetID,
                        sizeof( AFSEvalTargetCB));
 
-        pParentInfo = ObjectInfo->ParentObjectInformation;
-
-        if( pParentInfo != NULL)
+        if ( BooleanFlagOn( ObjectInfo->Flags, AFS_OBJECT_FLAGS_PARENT_FID))
         {
 
-            stTargetID.ParentId = pParentInfo->FileId;
+            pParentObjectInfo = AFSFindObjectInfo( ObjectInfo->VolumeCB,
+                                                   &ObjectInfo->ParentFileId,
+                                                   TRUE);
+
+            stTargetID.ParentId = ObjectInfo->ParentFileId;
         }
 
         //
         // Allocate our response buffer
         //
 
-        pEvalResultCB = (AFSFileEvalResultCB *)AFSExAllocatePoolWithTag( PagedPool,
-                                                                         PAGE_SIZE,
-                                                                         AFS_GENERIC_MEMORY_30_TAG);
+       pEvalResultCB = (AFSFileEvalResultCB *)AFSLibExAllocatePoolWithTag( PagedPool,
+                                                                           PAGE_SIZE,
+                                                                           AFS_GENERIC_MEMORY_30_TAG);
 
         if( pEvalResultCB == NULL)
         {
@@ -2741,6 +2728,8 @@ AFSEvaluateTargetByID( IN AFSObjectInfoCB *ObjectInfo,
                                       AuthGroup,
                                       NULL,
                                       &ObjectInfo->FileId,
+                                      ObjectInfo->VolumeCB->VolumeInformation.Cell,
+                                      ObjectInfo->VolumeCB->VolumeInformation.CellLength,
                                       &stTargetID,
                                       sizeof( AFSEvalTargetCB),
                                       pEvalResultCB,
@@ -2757,17 +2746,17 @@ AFSEvaluateTargetByID( IN AFSObjectInfoCB *ObjectInfo,
             if( ntStatus == STATUS_OBJECT_PATH_INVALID)
             {
 
-                if( pParentInfo != NULL)
+                if( pParentObjectInfo != NULL)
                 {
 
-                    AFSAcquireExcl( pParentInfo->Specific.Directory.DirectoryNodeHdr.TreeLock,
+                    AFSAcquireExcl( pParentObjectInfo->Specific.Directory.DirectoryNodeHdr.TreeLock,
                                     TRUE);
 
-                    SetFlag( pParentInfo->Flags, AFS_OBJECT_FLAGS_VERIFY);
+                    SetFlag( pParentObjectInfo->Flags, AFS_OBJECT_FLAGS_VERIFY);
 
-                    pParentInfo->DataVersion.QuadPart = (ULONGLONG)-1;
+                    pParentObjectInfo->DataVersion.QuadPart = (ULONGLONG)-1;
 
-                    AFSReleaseResource( pParentInfo->Specific.Directory.DirectoryNodeHdr.TreeLock);
+                    AFSReleaseResource( pParentObjectInfo->Specific.Directory.DirectoryNodeHdr.TreeLock);
                 }
             }
 
@@ -2775,24 +2764,80 @@ AFSEvaluateTargetByID( IN AFSObjectInfoCB *ObjectInfo,
         }
 
         //
+        // A BSOD can occur if the pEvalResultCB->FileType is FILE but the
+        // ObjectInfo->FileType is something else.  The same is true for
+        // pDirEnumEntry->FileType is DIRECTORY.  Perform a sanity check
+        // to ensure consistency.  An inconsistent pDirEnumEntry can be
+        // produced as a result of invalid status info received from a file
+        // server.  If the types are inconsistent or if the type does not
+        // match the implied type derived from the vnode (odd values are
+        // directories and even values are other types), prevent the request
+        // from completing successfully.  This may prevent access to the file or
+        // directory but will prevent a BSOD.
+        //
+
+        if ( !AFSIsEqualFID( &ObjectInfo->FileId,
+                             &pEvalResultCB->DirEnum.FileId))
+        {
+
+            try_return( ntStatus = STATUS_UNSUCCESSFUL);
+        }
+
+        switch ( pEvalResultCB->DirEnum.FileType)
+        {
+
+        case AFS_FILE_TYPE_DIRECTORY:
+            if ( (pEvalResultCB->DirEnum.FileId.Vnode & 0x1) != 0x1)
+            {
+
+                try_return( ntStatus = STATUS_UNSUCCESSFUL);
+            }
+
+            if ( ObjectInfo->FileType != AFS_FILE_TYPE_UNKNOWN &&
+                 ObjectInfo->FileType != AFS_FILE_TYPE_DIRECTORY)
+            {
+
+                try_return( ntStatus = STATUS_UNSUCCESSFUL);
+            }
+
+            break;
+
+        case AFS_FILE_TYPE_FILE:
+            if ( (pEvalResultCB->DirEnum.FileId.Vnode & 0x1) != 0x0)
+            {
+
+                try_return( ntStatus = STATUS_UNSUCCESSFUL);
+            }
+
+            if ( ObjectInfo->FileType != AFS_FILE_TYPE_UNKNOWN &&
+                 ObjectInfo->FileType != AFS_FILE_TYPE_FILE)
+            {
+
+                try_return( ntStatus = STATUS_UNSUCCESSFUL);
+            }
+
+            break;
+        }
+
+        //
         // Validate the parent data version
         //
 
-        if ( pParentInfo != NULL)
+        if ( pParentObjectInfo != NULL)
         {
 
-            AFSAcquireExcl( pParentInfo->Specific.Directory.DirectoryNodeHdr.TreeLock,
+            AFSAcquireExcl( pParentObjectInfo->Specific.Directory.DirectoryNodeHdr.TreeLock,
                             TRUE);
 
-            if ( pParentInfo->DataVersion.QuadPart != pEvalResultCB->ParentDataVersion.QuadPart)
+            if ( pParentObjectInfo->DataVersion.QuadPart != pEvalResultCB->ParentDataVersion.QuadPart)
             {
 
-                SetFlag( pParentInfo->Flags, AFS_OBJECT_FLAGS_VERIFY);
+                SetFlag( pParentObjectInfo->Flags, AFS_OBJECT_FLAGS_VERIFY);
 
-                pParentInfo->DataVersion.QuadPart = (ULONGLONG)-1;
+                pParentObjectInfo->DataVersion.QuadPart = (ULONGLONG)-1;
             }
 
-            AFSReleaseResource( pParentInfo->Specific.Directory.DirectoryNodeHdr.TreeLock);
+            AFSReleaseResource( pParentObjectInfo->Specific.Directory.DirectoryNodeHdr.TreeLock);
         }
 
         //
@@ -2802,9 +2847,9 @@ AFSEvaluateTargetByID( IN AFSObjectInfoCB *ObjectInfo,
         if( DirEnumEntry != NULL)
         {
 
-            pDirEnumCB = (AFSDirEnumEntry *)AFSExAllocatePoolWithTag( PagedPool,
-                                                                      PAGE_SIZE,
-                                                                      AFS_GENERIC_MEMORY_2_TAG);
+           pDirEnumCB = (AFSDirEnumEntry *)AFSLibExAllocatePoolWithTag( PagedPool,
+                                                                        PAGE_SIZE,
+                                                                        AFS_GENERIC_MEMORY_2_TAG);
 
             if( pDirEnumCB == NULL)
             {
@@ -2820,6 +2865,12 @@ AFSEvaluateTargetByID( IN AFSObjectInfoCB *ObjectInfo,
 
 try_exit:
 
+        if ( pParentObjectInfo != NULL)
+        {
+
+            AFSReleaseObjectInfo( &pParentObjectInfo);
+        }
+
         if( pEvalResultCB != NULL)
         {
 
@@ -2846,6 +2897,7 @@ NTSTATUS
 AFSEvaluateTargetByName( IN GUID *AuthGroup,
                          IN AFSObjectInfoCB *ParentObjectInfo,
                          IN PUNICODE_STRING SourceName,
+                         IN ULONG Flags,
                          OUT AFSDirEnumEntry **DirEnumEntry)
 {
 
@@ -2864,9 +2916,9 @@ AFSEvaluateTargetByName( IN GUID *AuthGroup,
         // Allocate our response buffer
         //
 
-        pEvalResultCB = (AFSFileEvalResultCB *)AFSExAllocatePoolWithTag( PagedPool,
-                                                                         PAGE_SIZE,
-                                                                         AFS_GENERIC_MEMORY_31_TAG);
+       pEvalResultCB = (AFSFileEvalResultCB *)AFSLibExAllocatePoolWithTag( PagedPool,
+                                                                           PAGE_SIZE,
+                                                                           AFS_GENERIC_MEMORY_31_TAG);
 
         if( pEvalResultCB == NULL)
         {
@@ -2881,10 +2933,12 @@ AFSEvaluateTargetByName( IN GUID *AuthGroup,
         ulResultBufferLength = PAGE_SIZE;
 
         ntStatus = AFSProcessRequest( AFS_REQUEST_TYPE_EVAL_TARGET_BY_NAME,
-                                      AFS_REQUEST_FLAG_SYNCHRONOUS,
+                                      AFS_REQUEST_FLAG_SYNCHRONOUS | Flags,
                                       AuthGroup,
                                       SourceName,
                                       NULL,
+                                      ParentObjectInfo->VolumeCB->VolumeInformation.Cell,
+                                      ParentObjectInfo->VolumeCB->VolumeInformation.CellLength,
                                       &stTargetID,
                                       sizeof( AFSEvalTargetCB),
                                       pEvalResultCB,
@@ -2933,9 +2987,9 @@ AFSEvaluateTargetByName( IN GUID *AuthGroup,
         if( DirEnumEntry != NULL)
         {
 
-            pDirEnumCB = (AFSDirEnumEntry *)AFSExAllocatePoolWithTag( PagedPool,
-                                                                      PAGE_SIZE,
-                                                                      AFS_GENERIC_MEMORY_3_TAG);
+           pDirEnumCB = (AFSDirEnumEntry *)AFSLibExAllocatePoolWithTag( PagedPool,
+                                                                        PAGE_SIZE,
+                                                                        AFS_GENERIC_MEMORY_3_TAG);
 
             if( pDirEnumCB == NULL)
             {
@@ -2994,6 +3048,8 @@ AFSRetrieveVolumeInformation( IN GUID *AuthGroup,
                                       FileID,
                                       NULL,
                                       0,
+                                      NULL,
+                                      0,
                                       VolumeInformation,
                                       &ulResultLen);
 
@@ -3032,6 +3088,8 @@ AFSRetrieveVolumeSizeInformation( IN GUID *AuthGroup,
                                       FileID,
                                       NULL,
                                       0,
+                                      NULL,
+                                      0,
                                       VolumeSizeInformation,
                                       &ulResultLen);
 
@@ -3081,10 +3139,10 @@ AFSNotifyPipeTransceive( IN AFSCcb *Ccb,
             try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES);
         }
 
-        pIoRequest = (AFSPipeIORequestCB *)AFSExAllocatePoolWithTag( PagedPool,
-                                                                     sizeof( AFSPipeIORequestCB) +
+       pIoRequest = (AFSPipeIORequestCB *)AFSLibExAllocatePoolWithTag( PagedPool,
+                                                                       sizeof( AFSPipeIORequestCB) +
                                                                                 InputLength,
-                                                                     AFS_GENERIC_MEMORY_4_TAG);
+                                                                       AFS_GENERIC_MEMORY_4_TAG);
 
         if( pIoRequest == NULL)
         {
@@ -3126,6 +3184,8 @@ AFSNotifyPipeTransceive( IN AFSCcb *Ccb,
                                       &Ccb->AuthGroup,
                                       &Ccb->DirectoryCB->NameInformation.FileName,
                                       NULL,
+                                      NULL,
+                                      0,
                                       pIoRequest,
                                       sizeof( AFSPipeIORequestCB) + InputLength,
                                       pOutputSystemBuffer,
@@ -3191,10 +3251,10 @@ AFSNotifySetPipeInfo( IN AFSCcb *Ccb,
     __Enter
     {
 
-        pInfoRequest = (AFSPipeInfoRequestCB *)AFSExAllocatePoolWithTag( PagedPool,
-                                                                         sizeof( AFSPipeInfoRequestCB) +
+       pInfoRequest = (AFSPipeInfoRequestCB *)AFSLibExAllocatePoolWithTag( PagedPool,
+                                                                           sizeof( AFSPipeInfoRequestCB) +
                                                                                 InputLength,
-                                                                         AFS_GENERIC_MEMORY_5_TAG);
+                                                                           AFS_GENERIC_MEMORY_5_TAG);
 
         if( pInfoRequest == NULL)
         {
@@ -3226,6 +3286,8 @@ AFSNotifySetPipeInfo( IN AFSCcb *Ccb,
                                       &Ccb->AuthGroup,
                                       &Ccb->DirectoryCB->NameInformation.FileName,
                                       NULL,
+                                      NULL,
+                                      0,
                                       pInfoRequest,
                                       sizeof( AFSPipeInfoRequestCB) + InputLength,
                                       NULL,
@@ -3292,6 +3354,8 @@ AFSNotifyQueryPipeInfo( IN AFSCcb *Ccb,
                                       &Ccb->AuthGroup,
                                       &Ccb->DirectoryCB->NameInformation.FileName,
                                       NULL,
+                                      NULL,
+                                      0,
                                       &stInfoRequest,
                                       sizeof( AFSPipeInfoRequestCB),
                                       DataBuffer,
@@ -3336,6 +3400,8 @@ AFSReleaseFid( IN AFSFileID *FileId)
                                       NULL,
                                       0,
                                       NULL,
+                                      0,
+                                      NULL,
                                       NULL);
     }
 
@@ -3393,3 +3459,148 @@ AFSIsExtentRequestQueued( IN AFSFileID *FileID,
 
     return bRequestQueued;
 }
+
+NTSTATUS
+AFSCreateSymlink( IN GUID *AuthGroup,
+                  IN AFSObjectInfoCB *ParentObjectInfo,
+                  IN UNICODE_STRING *FileName,
+                  IN AFSObjectInfoCB *ObjectInfo,
+                  IN UNICODE_STRING *TargetName)
+{
+
+    NTSTATUS                  ntStatus = STATUS_SUCCESS;
+    AFSCreateSymlinkCB       *pSymlinkCreate = NULL;
+    ULONG                     ulResultLen = 0;
+    AFSCreateSymlinkResultCB *pSymlinkResult = NULL;
+
+    __Enter
+    {
+
+        //
+        // Allocate our request and result structures
+        //
+
+       pSymlinkCreate = (AFSCreateSymlinkCB *)AFSLibExAllocatePoolWithTag( PagedPool,
+                                                                           sizeof( AFSCreateSymlinkCB) +
+                                                                           TargetName->Length,
+                                                                           AFS_SYMLINK_REQUEST_TAG);
+
+        if( pSymlinkCreate == NULL)
+        {
+
+            try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES);
+        }
+
+        RtlZeroMemory( pSymlinkCreate,
+                       sizeof( AFSCreateSymlinkCB) +
+                             TargetName->Length);
+
+       pSymlinkResult = (AFSCreateSymlinkResultCB *)AFSLibExAllocatePoolWithTag( PagedPool,
+                                                                                 PAGE_SIZE,
+                                                                                 AFS_SYMLINK_REQUEST_TAG);
+
+        if( pSymlinkResult == NULL)
+        {
+
+            try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES);
+        }
+
+        RtlZeroMemory( pSymlinkResult,
+                       PAGE_SIZE);
+
+        //
+        // Populate the request buffer
+        //
+
+        RtlCopyMemory( &pSymlinkCreate->ParentId,
+                       &ObjectInfo->ParentFileId,
+                       sizeof( AFSFileID));
+
+        pSymlinkCreate->TargetNameLength = TargetName->Length;
+
+        RtlCopyMemory( pSymlinkCreate->TargetName,
+                       TargetName->Buffer,
+                       TargetName->Length);
+
+        ulResultLen = PAGE_SIZE;
+
+        //
+        // Call the service to create the symlink entry
+        //
+
+        ntStatus = AFSProcessRequest( AFS_REQUEST_TYPE_CREATE_SYMLINK,
+                                      AFS_REQUEST_FLAG_SYNCHRONOUS,
+                                      AuthGroup,
+                                      FileName,
+                                      &ObjectInfo->FileId,
+                                      ObjectInfo->VolumeCB->VolumeInformation.Cell,
+                                      ObjectInfo->VolumeCB->VolumeInformation.CellLength,
+                                      pSymlinkCreate,
+                                      sizeof( AFSCreateSymlinkCB) +
+                                                TargetName->Length,
+                                      pSymlinkResult,
+                                      &ulResultLen);
+
+        if ( ntStatus == STATUS_FILE_DELETED )
+        {
+
+            AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
+                          AFS_TRACE_LEVEL_ERROR,
+                          "AFSCreateSymlink failed FID %08lX-%08lX-%08lX-%08lX Status %08lX\n",
+                          ObjectInfo->FileId.Cell,
+                          ObjectInfo->FileId.Volume,
+                          ObjectInfo->FileId.Vnode,
+                          ObjectInfo->FileId.Unique,
+                          ntStatus));
+
+            SetFlag( ParentObjectInfo->Flags, AFS_OBJECT_FLAGS_VERIFY);
+
+            ClearFlag( ParentObjectInfo->Flags, AFS_OBJECT_FLAGS_DIRECTORY_ENUMERATED);
+
+            SetFlag( ObjectInfo->Flags, AFS_OBJECT_FLAGS_DELETED);
+
+            try_return( ntStatus = STATUS_ACCESS_DENIED);
+        }
+        else if( ntStatus != STATUS_SUCCESS)
+        {
+
+            AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
+                          AFS_TRACE_LEVEL_ERROR,
+                          "AFSCreateSymlink failed FID %08lX-%08lX-%08lX-%08lX Status %08lX\n",
+                          ObjectInfo->FileId.Cell,
+                          ObjectInfo->FileId.Volume,
+                          ObjectInfo->FileId.Vnode,
+                          ObjectInfo->FileId.Unique,
+                          ntStatus));
+
+            try_return( ntStatus);
+        }
+
+        //
+        // After successful creation the open object has been deleted and replaced by
+        // the actual symlink.
+        //
+
+        SetFlag( ParentObjectInfo->Flags, AFS_OBJECT_FLAGS_VERIFY);
+
+        ClearFlag( ParentObjectInfo->Flags, AFS_OBJECT_FLAGS_DIRECTORY_ENUMERATED);
+
+        SetFlag( ObjectInfo->Flags, AFS_OBJECT_FLAGS_DELETED);
+
+try_exit:
+
+        if( pSymlinkCreate != NULL)
+        {
+
+            AFSExFreePoolWithTag( pSymlinkCreate, AFS_SYMLINK_REQUEST_TAG);
+        }
+
+        if( pSymlinkResult != NULL)
+        {
+
+            AFSExFreePoolWithTag( pSymlinkResult, AFS_SYMLINK_REQUEST_TAG);
+        }
+    }
+
+    return ntStatus;
+}