Windows: Fix trace msg typo in AFSDeleteDirEntry
[openafs.git] / src / WINNT / afsrdr / kernel / lib / AFSNameSupport.cpp
index ff10961..b0a6ae0 100644 (file)
 
 #include "AFSCommon.h"
 
+//
+// AFSLocateNameEntry
+//
+// On entry, *VolumeCB must have a held ReferenceCount provided by
+// the caller which will not be released.  On successful exit, *OutVolumeCB
+// will be assigned the new current volume with a held ReferenceCount.
+//
+// On entry, *ParentDirectoryCB must have a held DirOpenReferenceCount
+// provided by the caller.  This reference will not be released.
+// On exit, if OutParentDirectoryCB is set, it will have a new reference.
+//
+// On exit, if OutDirectoryCB is set, it will have a reference.
+//
+
 NTSTATUS
 AFSLocateNameEntry( IN GUID *AuthGroup,
                     IN PFILE_OBJECT FileObject,
-                    IN UNICODE_STRING *RootPathName,
+                    IN OUT UNICODE_STRING *RootPathName,
                     IN UNICODE_STRING *ParsedPathName,
                     IN AFSNameArrayHdr *NameArray,
                     IN ULONG Flags,
-                    OUT AFSVolumeCB **VolumeCB,
-                    IN OUT AFSDirectoryCB **ParentDirectoryCB,
-                    OUT AFSDirectoryCB **DirectoryCB,
+                    IN AFSVolumeCB *VolumeCB,
+                    IN AFSDirectoryCB *ParentDirectoryCB,
+                    OUT AFSVolumeCB **OutVolumeCB,
+                    OUT LONG *OutVolumeReferenceReason,
+                    OUT AFSDirectoryCB **OutParentDirectoryCB,
+                    OUT AFSDirectoryCB **OutDirectoryCB,
                     OUT PUNICODE_STRING ComponentName)
 {
 
@@ -55,7 +72,7 @@ AFSLocateNameEntry( IN GUID *AuthGroup,
     UNICODE_STRING    uniPathName, uniComponentName, uniRemainingPath, uniSearchName, uniFullPathName;
     ULONG             ulCRC = 0;
     AFSDirectoryCB   *pDirEntry = NULL, *pParentDirEntry = NULL;
-    AFSDeviceExt *pDevExt = (AFSDeviceExt *) AFSRDRDeviceObject->DeviceExtension;
+    AFSDeviceExt     *pDevExt = (AFSDeviceExt *) AFSRDRDeviceObject->DeviceExtension;
     UNICODE_STRING    uniSysName;
     ULONG             ulSubstituteIndex = 0;
     BOOLEAN           bSubstituteName = FALSE;
@@ -64,19 +81,23 @@ AFSLocateNameEntry( IN GUID *AuthGroup,
     UNICODE_STRING    uniRelativeName, uniNoOpName;
     AFSObjectInfoCB  *pCurrentObject = NULL;
     AFSObjectInfoCB  *pParentObjectInfo = NULL;
-    AFSVolumeCB      *pCurrentVolume = *VolumeCB;
-    BOOLEAN           bReleaseCurrentVolume = TRUE;
+    AFSVolumeCB      *pCurrentVolume = NULL;
+    AFSVolumeCB      *pTargetVolume = NULL;
+    BOOLEAN           bReleaseCurrentVolume = FALSE;
+    LONG              VolumeReferenceReason;
     BOOLEAN           bSubstitutedName = FALSE;
     LONG              lCount;
 
     __Enter
     {
 
-        AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+        ASSERT( *OutVolumeCB != VolumeCB);
+
+        AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                       AFS_TRACE_LEVEL_VERBOSE_2,
-                      "AFSLocateNameEntry (FO: %08lX) Processing full name %wZ\n",
+                      "AFSLocateNameEntry (FO: %p) Processing full name %wZ\n",
                       FileObject,
-                      RootPathName);
+                      RootPathName));
 
         RtlInitUnicodeString( &uniSysName,
                               L"*@SYS");
@@ -106,7 +127,37 @@ AFSLocateNameEntry( IN GUID *AuthGroup,
 
         pParentDirEntry = NULL;
 
-        pDirEntry = *ParentDirectoryCB;
+        pDirEntry = ParentDirectoryCB;
+
+        //
+        // Increment our reference on this dir entry
+        //
+
+        lCount = InterlockedIncrement( &pDirEntry->DirOpenReferenceCount);
+
+        AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
+                      AFS_TRACE_LEVEL_VERBOSE,
+                      "AFSLocateNameEntry Increment1 count on %wZ DE %p Ccb %p Cnt %d\n",
+                      &pDirEntry->NameInformation.FileName,
+                      pDirEntry,
+                      NULL,
+                      lCount));
+
+        pCurrentVolume = VolumeCB;
+
+        VolumeReferenceReason = AFS_VOLUME_REFERENCE_LOCATE_NAME;
+
+        lCount = AFSVolumeIncrement( pCurrentVolume,
+                                     VolumeReferenceReason);
+
+        AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING,
+                      AFS_TRACE_LEVEL_VERBOSE,
+                      "AFSLocateNameEntry Increment count on volume %p Reason %u Cnt %d\n",
+                      pCurrentVolume,
+                      VolumeReferenceReason,
+                      lCount));
+
+        bReleaseCurrentVolume = TRUE;
 
         uniPathName = *ParsedPathName;
 
@@ -121,11 +172,13 @@ AFSLocateNameEntry( IN GUID *AuthGroup,
         uniSearchName.Length = uniSearchName.MaximumLength = 0;
         uniSearchName.Buffer = NULL;
 
-        ASSERT( pCurrentVolume->VolumeReferenceCount > 1);
-
         while( TRUE)
         {
 
+            ASSERT( pCurrentVolume->VolumeReferenceCount > 0);
+
+            ASSERT( pDirEntry->DirOpenReferenceCount > 0);
+
             //
             // Check our total link count for this name array
             //
@@ -147,16 +200,16 @@ AFSLocateNameEntry( IN GUID *AuthGroup,
             if( BooleanFlagOn( pDirEntry->Flags, AFS_DIR_ENTRY_DELETED))
             {
 
-                AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                               AFS_TRACE_LEVEL_ERROR,
-                              "AFSLocateNameEntry (FO: %08lX) Deleted parent %wZ FID %08lX-%08lX-%08lX-%08lX Status %08lX\n",
+                              "AFSLocateNameEntry (FO: %p) Deleted parent %wZ FID %08lX-%08lX-%08lX-%08lX Status %08lX\n",
                               FileObject,
                               &pDirEntry->NameInformation.FileName,
                               pCurrentObject->FileId.Cell,
                               pCurrentObject->FileId.Volume,
                               pCurrentObject->FileId.Vnode,
                               pCurrentObject->FileId.Unique,
-                              STATUS_FILE_DELETED);
+                              STATUS_FILE_DELETED));
 
                 try_return( ntStatus = STATUS_FILE_DELETED);
             }
@@ -164,16 +217,16 @@ AFSLocateNameEntry( IN GUID *AuthGroup,
             if( BooleanFlagOn( pDirEntry->Flags, AFS_DIR_ENTRY_PENDING_DELETE))
             {
 
-                AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                               AFS_TRACE_LEVEL_ERROR,
-                              "AFSLocateNameEntry (FO: %08lX) Delete pending on %wZ FID %08lX-%08lX-%08lX-%08lX Status %08lX\n",
+                              "AFSLocateNameEntry (FO: %p) Delete pending on %wZ FID %08lX-%08lX-%08lX-%08lX Status %08lX\n",
                               FileObject,
                               &pDirEntry->NameInformation.FileName,
                               pCurrentObject->FileId.Cell,
                               pCurrentObject->FileId.Volume,
                               pCurrentObject->FileId.Vnode,
                               pCurrentObject->FileId.Unique,
-                              STATUS_DELETE_PENDING);
+                              STATUS_DELETE_PENDING));
 
                 try_return( ntStatus = STATUS_DELETE_PENDING);
             }
@@ -187,15 +240,15 @@ AFSLocateNameEntry( IN GUID *AuthGroup,
                   !AFSIsEnumerationInProcess( pCurrentObject)))
             {
 
-                AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                               AFS_TRACE_LEVEL_VERBOSE,
-                              "AFSLocateNameEntry (FO: %08lX) Verifying parent %wZ FID %08lX-%08lX-%08lX-%08lX\n",
+                              "AFSLocateNameEntry (FO: %p) Verifying parent %wZ FID %08lX-%08lX-%08lX-%08lX\n",
                               FileObject,
                               &pDirEntry->NameInformation.FileName,
                               pCurrentObject->FileId.Cell,
                               pCurrentObject->FileId.Volume,
                               pCurrentObject->FileId.Vnode,
-                              pCurrentObject->FileId.Unique);
+                              pCurrentObject->FileId.Unique));
 
                 //
                 // Directory TreeLock should be exclusively held
@@ -212,16 +265,16 @@ AFSLocateNameEntry( IN GUID *AuthGroup,
                 if( !NT_SUCCESS( ntStatus))
                 {
 
-                    AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                    AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                   AFS_TRACE_LEVEL_ERROR,
-                                  "AFSLocateNameEntry (FO: %08lX) Failed to verify parent %wZ FID %08lX-%08lX-%08lX-%08lX Status %08lX\n",
+                                  "AFSLocateNameEntry (FO: %p) Failed to verify parent %wZ FID %08lX-%08lX-%08lX-%08lX Status %08lX\n",
                                   FileObject,
                                   &pDirEntry->NameInformation.FileName,
                                   pCurrentObject->FileId.Cell,
                                   pCurrentObject->FileId.Volume,
                                   pCurrentObject->FileId.Vnode,
                                   pCurrentObject->FileId.Unique,
-                                  ntStatus);
+                                  ntStatus));
 
                     try_return( ntStatus);
                 }
@@ -235,15 +288,15 @@ AFSLocateNameEntry( IN GUID *AuthGroup,
                 pCurrentObject->FileType == AFS_FILE_TYPE_UNKNOWN)
             {
 
-                AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                               AFS_TRACE_LEVEL_VERBOSE,
-                              "AFSLocateNameEntry (FO: %08lX) Evaluating parent %wZ FID %08lX-%08lX-%08lX-%08lX\n",
+                              "AFSLocateNameEntry (FO: %p) Evaluating parent %wZ FID %08lX-%08lX-%08lX-%08lX\n",
                               FileObject,
                               &pDirEntry->NameInformation.FileName,
                               pCurrentObject->FileId.Cell,
                               pCurrentObject->FileId.Volume,
                               pCurrentObject->FileId.Vnode,
-                              pCurrentObject->FileId.Unique);
+                              pCurrentObject->FileId.Unique));
 
                 ntStatus = AFSEvaluateNode( AuthGroup,
                                             pDirEntry);
@@ -254,51 +307,51 @@ AFSLocateNameEntry( IN GUID *AuthGroup,
                     if ( ntStatus == STATUS_NOT_A_DIRECTORY)
                     {
 
-                        if ( pCurrentObject->ParentObjectInformation == NULL)
+                        if ( !BooleanFlagOn( pCurrentObject->Flags, AFS_OBJECT_FLAGS_PARENT_FID))
                         {
 
-                            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                            AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                           AFS_TRACE_LEVEL_ERROR,
-                                          "AFSLocateNameEntry (FO: %08lX) Failed to evaluate object %wZ FID %08lX-%08lX-%08lX-%08lX PARENT NULL Status %08lX\n",
+                                          "AFSLocateNameEntry (FO: %p) Failed to evaluate object %wZ FID %08lX-%08lX-%08lX-%08lX PARENT NULL Status %08lX\n",
                                           FileObject,
                                           &pDirEntry->NameInformation.FileName,
                                           pCurrentObject->FileId.Cell,
                                           pCurrentObject->FileId.Volume,
                                           pCurrentObject->FileId.Vnode,
                                           pCurrentObject->FileId.Unique,
-                                          ntStatus);
+                                          ntStatus));
                         }
                         else
                         {
 
-                            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                            AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                           AFS_TRACE_LEVEL_ERROR,
-                                          "AFSLocateNameEntry (FO: %08lX) Failed to evaluate object %wZ FID %08lX-%08lX-%08lX-%08lX PARENT %08lX-%08lX-%08lX-%08lX Status %08lX\n",
+                                          "AFSLocateNameEntry (FO: %p) Failed to evaluate object %wZ FID %08lX-%08lX-%08lX-%08lX PARENT %08lX-%08lX-%08lX-%08lX Status %08lX\n",
                                           FileObject,
                                           &pDirEntry->NameInformation.FileName,
                                           pCurrentObject->FileId.Cell,
                                           pCurrentObject->FileId.Volume,
                                           pCurrentObject->FileId.Vnode,
                                           pCurrentObject->FileId.Unique,
-                                          pCurrentObject->ParentObjectInformation->FileId.Cell,
-                                          pCurrentObject->ParentObjectInformation->FileId.Volume,
-                                          pCurrentObject->ParentObjectInformation->FileId.Vnode,
-                                          pCurrentObject->ParentObjectInformation->FileId.Unique,
-                                          ntStatus);
+                                          pCurrentObject->ParentFileId.Cell,
+                                          pCurrentObject->ParentFileId.Volume,
+                                          pCurrentObject->ParentFileId.Vnode,
+                                          pCurrentObject->ParentFileId.Unique,
+                                          ntStatus));
                         }
                     }
                     else
                     {
-                        AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                        AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                       AFS_TRACE_LEVEL_ERROR,
-                                      "AFSLocateNameEntry (FO: %08lX) Failed to evaluate parent %wZ FID %08lX-%08lX-%08lX-%08lX Status %08lX\n",
+                                      "AFSLocateNameEntry (FO: %p) Failed to evaluate parent %wZ FID %08lX-%08lX-%08lX-%08lX Status %08lX\n",
                                       FileObject,
                                       &pDirEntry->NameInformation.FileName,
                                       pCurrentObject->FileId.Cell,
                                       pCurrentObject->FileId.Volume,
                                       pCurrentObject->FileId.Vnode,
                                       pCurrentObject->FileId.Unique,
-                                      ntStatus);
+                                      ntStatus));
                     }
 
                     try_return( ntStatus);
@@ -334,11 +387,19 @@ AFSLocateNameEntry( IN GUID *AuthGroup,
                         // Pass back the directory entries
                         //
 
-                        *ParentDirectoryCB = pParentDirEntry;
+                        *OutParentDirectoryCB = pParentDirEntry;
+
+                        pParentDirEntry = NULL;
+
+                        *OutDirectoryCB = pDirEntry;
+
+                        pDirEntry = NULL;
+
+                        *OutVolumeCB = pCurrentVolume;
 
-                        *DirectoryCB = pDirEntry;
+                        *OutVolumeReferenceReason = VolumeReferenceReason;
 
-                        *VolumeCB = pCurrentVolume;
+                        bReleaseCurrentVolume = FALSE;
 
                         *RootPathName = uniFullPathName;
 
@@ -362,15 +423,15 @@ AFSLocateNameEntry( IN GUID *AuthGroup,
 
                         SetFlag( pCurrentObject->Flags, AFS_OBJECT_FLAGS_VERIFY);
 
-                        AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                        AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                       AFS_TRACE_LEVEL_VERBOSE,
-                                      "AFSLocateNameEntry (FO: %08lX) Verifying symlink parent %wZ FID %08lX-%08lX-%08lX-%08lX\n",
+                                      "AFSLocateNameEntry (FO: %p) Verifying symlink parent %wZ FID %08lX-%08lX-%08lX-%08lX\n",
                                       FileObject,
                                       &pDirEntry->NameInformation.FileName,
                                       pCurrentObject->FileId.Cell,
                                       pCurrentObject->FileId.Volume,
                                       pCurrentObject->FileId.Vnode,
-                                      pCurrentObject->FileId.Unique);
+                                      pCurrentObject->FileId.Unique));
 
                         //
                         // Directory TreeLock should be exclusively held
@@ -384,16 +445,16 @@ AFSLocateNameEntry( IN GUID *AuthGroup,
                         if( !NT_SUCCESS( ntStatus))
                         {
 
-                            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                            AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                           AFS_TRACE_LEVEL_ERROR,
-                                          "AFSLocateNameEntry (FO: %08lX) Failed to verify symlink parent %wZ FID %08lX-%08lX-%08lX-%08lX Status %08lX\n",
+                                          "AFSLocateNameEntry (FO: %p) Failed to verify symlink parent %wZ FID %08lX-%08lX-%08lX-%08lX Status %08lX\n",
                                           FileObject,
                                           &pDirEntry->NameInformation.FileName,
                                           pCurrentObject->FileId.Cell,
                                           pCurrentObject->FileId.Volume,
                                           pCurrentObject->FileId.Vnode,
                                           pCurrentObject->FileId.Unique,
-                                          ntStatus);
+                                          ntStatus));
 
                             AFSReleaseResource( &pDirEntry->NonPaged->Lock);
 
@@ -427,16 +488,16 @@ AFSLocateNameEntry( IN GUID *AuthGroup,
 
                         ntStatus = STATUS_REPARSE_POINT_NOT_RESOLVED;
 
-                        AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                        AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                       AFS_TRACE_LEVEL_ERROR,
-                                      "AFSLocateNameEntry (FO: %08lX) Failed to retrieve target name for symlink %wZ FID %08lX-%08lX-%08lX-%08lX Status %08lX\n",
+                                      "AFSLocateNameEntry (FO: %p) Failed to retrieve target name for symlink %wZ FID %08lX-%08lX-%08lX-%08lX Status %08lX\n",
                                       FileObject,
                                       &pDirEntry->NameInformation.FileName,
                                       pCurrentObject->FileId.Cell,
                                       pCurrentObject->FileId.Volume,
                                       pCurrentObject->FileId.Vnode,
                                       pCurrentObject->FileId.Unique,
-                                      ntStatus);
+                                      ntStatus));
 
                         AFSReleaseResource( &pDirEntry->NonPaged->Lock);
 
@@ -446,16 +507,16 @@ AFSLocateNameEntry( IN GUID *AuthGroup,
                     if( AFSIsRelativeName( &pDirEntry->NameInformation.TargetName))
                     {
 
-                        AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                        AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                       AFS_TRACE_LEVEL_VERBOSE,
-                                      "AFSLocateNameEntry (FO: %08lX) Processing relative symlink target %wZ for %wZ FID %08lX-%08lX-%08lX-%08lX\n",
+                                      "AFSLocateNameEntry (FO: %p) Processing relative symlink target %wZ for %wZ FID %08lX-%08lX-%08lX-%08lX\n",
                                       FileObject,
                                       &pDirEntry->NameInformation.TargetName,
                                       &pDirEntry->NameInformation.FileName,
                                       pCurrentObject->FileId.Cell,
                                       pCurrentObject->FileId.Volume,
                                       pCurrentObject->FileId.Vnode,
-                                      pCurrentObject->FileId.Unique);
+                                      pCurrentObject->FileId.Unique));
 
                         //
                         // We'll substitute this name into the current process name
@@ -561,15 +622,17 @@ AFSLocateNameEntry( IN GUID *AuthGroup,
                         // Dereference the current entry ..
                         //
 
-                        lCount = InterlockedDecrement( &pDirEntry->OpenReferenceCount);
+                        lCount = InterlockedDecrement( &pDirEntry->DirOpenReferenceCount);
 
-                        AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
+                        AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
                                       AFS_TRACE_LEVEL_VERBOSE,
                                       "AFSLocateNameEntry Decrement1 count on %wZ DE %p Ccb %p Cnt %d\n",
                                       &pDirEntry->NameInformation.FileName,
                                       pDirEntry,
                                       NULL,
-                                      lCount);
+                                      lCount));
+
+                        ASSERT( lCount >= 0);
 
                         //
                         // OK, need to back up one entry for the correct parent since the current
@@ -578,54 +641,105 @@ AFSLocateNameEntry( IN GUID *AuthGroup,
 
                         pDirEntry = AFSBackupEntry( pNameArray);
 
+                        pCurrentObject = pDirEntry->ObjectInformation;
+
                         //
                         // Increment our reference on this dir entry
                         //
 
-                        lCount = InterlockedIncrement( &pDirEntry->OpenReferenceCount);
+                        lCount = InterlockedIncrement( &pDirEntry->DirOpenReferenceCount);
 
-                        AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
+                        AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
                                       AFS_TRACE_LEVEL_VERBOSE,
-                                      "AFSLocateNameEntry Increment1 count on %wZ DE %p Ccb %p Cnt %d\n",
+                                      "AFSLocateNameEntry Increment2 count on %wZ DE %p Ccb %p Cnt %d\n",
                                       &pDirEntry->NameInformation.FileName,
                                       pDirEntry,
                                       NULL,
-                                      lCount);
+                                      lCount));
 
-                        if( BooleanFlagOn( pDirEntry->ObjectInformation->Flags, AFS_OBJECT_ROOT_VOLUME))
+                        if ( pParentDirEntry)
                         {
 
+                            lCount = InterlockedDecrement( &pParentDirEntry->DirOpenReferenceCount);
+
+                            AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
+                                          AFS_TRACE_LEVEL_VERBOSE,
+                                          "AFSLocateNameEntry Decrement count on %wZ DE %p Ccb %p Cnt %d\n",
+                                          &pParentDirEntry->NameInformation.FileName,
+                                          pParentDirEntry,
+                                          NULL,
+                                          lCount));
+
                             pParentDirEntry = NULL;
                         }
-                        else
+
+                        if( !BooleanFlagOn( pDirEntry->ObjectInformation->Flags, AFS_OBJECT_ROOT_VOLUME))
                         {
 
                             pParentDirEntry = AFSGetParentEntry( pNameArray);
 
                             ASSERT( pParentDirEntry != pDirEntry);
+
+                            lCount = InterlockedIncrement( &pParentDirEntry->DirOpenReferenceCount);
+
+                            AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
+                                          AFS_TRACE_LEVEL_VERBOSE,
+                                          "AFSLocateNameEntry Increment count on %wZ DE %p Ccb %p Cnt %d\n",
+                                          &pParentDirEntry->NameInformation.FileName,
+                                          pParentDirEntry,
+                                          NULL,
+                                          lCount));
+                        }
+
+                        if ( pDirEntry->ObjectInformation->VolumeCB != pCurrentVolume)
+                        {
+
+                            lCount = AFSVolumeDecrement( pCurrentVolume,
+                                                         VolumeReferenceReason);
+
+                            AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING,
+                                          AFS_TRACE_LEVEL_VERBOSE,
+                                          "AFSLocateNameEntry Decrement count on volume %p Reason %u Cnt %d\n",
+                                          pCurrentVolume,
+                                          VolumeReferenceReason,
+                                          lCount));
+
+                            pCurrentVolume = pDirEntry->ObjectInformation->VolumeCB;
+
+                            VolumeReferenceReason = AFS_VOLUME_REFERENCE_LOCATE_NAME;
+
+                            lCount = AFSVolumeIncrement( pCurrentVolume,
+                                                         VolumeReferenceReason);
+
+                            AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING,
+                                          AFS_TRACE_LEVEL_VERBOSE,
+                                          "AFSLocateNameEntry Increment count on volume %p Reason %u Cnt %d\n",
+                                          pCurrentVolume,
+                                          VolumeReferenceReason,
+                                          lCount));
                         }
                     }
                     else
                     {
 
-                        AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                        AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                       AFS_TRACE_LEVEL_VERBOSE,
-                                      "AFSLocateNameEntry (FO: %08lX) Processing absolute symlink target %wZ for %wZ FID %08lX-%08lX-%08lX-%08lX\n",
+                                      "AFSLocateNameEntry (FO: %p) Processing absolute symlink target %wZ for %wZ FID %08lX-%08lX-%08lX-%08lX\n",
                                       FileObject,
                                       &pDirEntry->NameInformation.TargetName,
                                       &pDirEntry->NameInformation.FileName,
                                       pCurrentObject->FileId.Cell,
                                       pCurrentObject->FileId.Volume,
                                       pCurrentObject->FileId.Vnode,
-                                      pCurrentObject->FileId.Unique);
+                                      pCurrentObject->FileId.Unique));
 
                         if ( !AFSIsAbsoluteAFSName( &pDirEntry->NameInformation.TargetName))
                         {
 
-                            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                            AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                           AFS_TRACE_LEVEL_ERROR,
                                           "AFSLocateNameEntry Name %wZ contains invalid server name\n",
-                                          &pDirEntry->NameInformation.TargetName);
+                                          &pDirEntry->NameInformation.TargetName));
 
                             //
                             // The correct response would be STATUS_OBJECT_PATH_INVALID
@@ -729,64 +843,74 @@ AFSLocateNameEntry( IN GUID *AuthGroup,
                         if( pCurrentVolume != AFSGlobalRoot)
                         {
 
-                            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                            AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                           AFS_TRACE_LEVEL_VERBOSE,
-                                          "AFSLocateNameEntry (FO: %08lX) Current volume not global, resetting for %wZ FID %08lX-%08lX-%08lX-%08lX\n",
+                                          "AFSLocateNameEntry (FO: %p) Current volume not global, resetting for %wZ FID %08lX-%08lX-%08lX-%08lX\n",
                                           FileObject,
                                           &pDirEntry->NameInformation.FileName,
                                           pCurrentObject->FileId.Cell,
                                           pCurrentObject->FileId.Volume,
                                           pCurrentObject->FileId.Vnode,
-                                          pCurrentObject->FileId.Unique);
+                                          pCurrentObject->FileId.Unique));
 
-                            lCount = InterlockedDecrement( &pCurrentVolume->VolumeReferenceCount);
+                            lCount = AFSVolumeDecrement( pCurrentVolume,
+                                                         VolumeReferenceReason);
 
-                            AFSDbgLogMsg( AFS_SUBSYSTEM_VOLUME_REF_COUNTING,
+                            AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING,
                                           AFS_TRACE_LEVEL_VERBOSE,
-                                          "AFSLocateNameEntry Decrement count on volume %08lX Cnt %d\n",
+                                          "AFSLocateNameEntry Decrement count on volume %p Reason %u Cnt %d\n",
                                           pCurrentVolume,
-                                          lCount);
+                                          VolumeReferenceReason,
+                                          lCount));
 
                             pCurrentVolume = AFSGlobalRoot;
 
-                            lCount = InterlockedIncrement( &pCurrentVolume->VolumeReferenceCount);
+                            VolumeReferenceReason = AFS_VOLUME_REFERENCE_LOCATE_NAME;
+
+                            lCount = AFSVolumeIncrement( pCurrentVolume,
+                                                         VolumeReferenceReason);
 
-                            AFSDbgLogMsg( AFS_SUBSYSTEM_VOLUME_REF_COUNTING,
+                            AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING,
                                           AFS_TRACE_LEVEL_VERBOSE,
-                                          "AFSLocateNameEntry Increment count on volume %08lX Cnt %d\n",
+                                          "AFSLocateNameEntry Increment count on volume %p Reason %u Cnt %d\n",
                                           pCurrentVolume,
-                                          lCount);
+                                          VolumeReferenceReason,
+                                          lCount));
                         }
 
                         //
                         // Dereference our current dir entry
                         //
 
-                        lCount = InterlockedDecrement( &pDirEntry->OpenReferenceCount);
+                        lCount = InterlockedDecrement( &pDirEntry->DirOpenReferenceCount);
 
-                        AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
+                        AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
                                       AFS_TRACE_LEVEL_VERBOSE,
                                       "AFSLocateNameEntry Decrement2 count on %wZ DE %p Ccb %p Cnt %d\n",
                                       &pDirEntry->NameInformation.FileName,
                                       pDirEntry,
                                       NULL,
-                                      lCount);
+                                      lCount));
+
+                        ASSERT( lCount >= 0);
 
                         pDirEntry = pCurrentVolume->DirectoryCB;
 
+                        pCurrentObject = pDirEntry->ObjectInformation;
+
                         //
                         // Reference the new dir entry
                         //
 
-                        lCount = InterlockedIncrement( &pDirEntry->OpenReferenceCount);
+                        lCount = InterlockedIncrement( &pDirEntry->DirOpenReferenceCount);
 
-                        AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
+                        AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
                                       AFS_TRACE_LEVEL_VERBOSE,
                                       "AFSLocateNameEntry Increment2 count on %wZ DE %p Ccb %p Cnt %d\n",
                                       &pDirEntry->NameInformation.FileName,
                                       pDirEntry,
                                       NULL,
-                                      lCount);
+                                      lCount));
 
                         //
                         // Reset the name array
@@ -795,22 +919,36 @@ AFSLocateNameEntry( IN GUID *AuthGroup,
 
                         lLinkCount = pNameArray->LinkCount;
 
-                        AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                        AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                       AFS_TRACE_LEVEL_VERBOSE,
-                                      "AFSLocateNameEntry (FO: %08lX) Resetting name array for %wZ FID %08lX-%08lX-%08lX-%08lX\n",
+                                      "AFSLocateNameEntry (FO: %p) Resetting name array for %wZ FID %08lX-%08lX-%08lX-%08lX\n",
                                       FileObject,
                                       &pDirEntry->NameInformation.FileName,
                                       pCurrentObject->FileId.Cell,
                                       pCurrentObject->FileId.Volume,
                                       pCurrentObject->FileId.Vnode,
-                                      pCurrentObject->FileId.Unique);
+                                      pCurrentObject->FileId.Unique));
 
                         AFSResetNameArray( pNameArray,
                                            pDirEntry);
 
                         pNameArray->LinkCount = lLinkCount;
 
-                        pParentDirEntry = NULL;
+                        if ( pParentDirEntry)
+                        {
+
+                            lCount = InterlockedDecrement( &pParentDirEntry->DirOpenReferenceCount);
+
+                            AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
+                                          AFS_TRACE_LEVEL_VERBOSE,
+                                          "AFSLocateNameEntry Decrement count on %wZ DE %p Ccb %p Cnt %d\n",
+                                          &pParentDirEntry->NameInformation.FileName,
+                                          pParentDirEntry,
+                                          NULL,
+                                          lCount));
+
+                            pParentDirEntry = NULL;
+                        }
                     }
 
                     //
@@ -838,26 +976,34 @@ AFSLocateNameEntry( IN GUID *AuthGroup,
                         // Pass back the directory entries
                         //
 
-                        *ParentDirectoryCB = pParentDirEntry;
+                        *OutParentDirectoryCB = pParentDirEntry;
+
+                        pParentDirEntry = NULL;
+
+                        *OutDirectoryCB = pDirEntry;
 
-                        *DirectoryCB = pDirEntry;
+                        pDirEntry = NULL;
+
+                        *OutVolumeCB = pCurrentVolume;
 
-                        *VolumeCB = pCurrentVolume;
+                        *OutVolumeReferenceReason = VolumeReferenceReason;
+
+                        bReleaseCurrentVolume = FALSE;
 
                         *RootPathName = uniFullPathName;
 
                         try_return( ntStatus);
                     }
 
-                    AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                    AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                   AFS_TRACE_LEVEL_VERBOSE,
-                                  "AFSLocateNameEntry (FO: %08lX) Building MP target for parent %wZ FID %08lX-%08lX-%08lX-%08lX\n",
+                                  "AFSLocateNameEntry (FO: %p) Building MP target for parent %wZ FID %08lX-%08lX-%08lX-%08lX\n",
                                   FileObject,
                                   &pDirEntry->NameInformation.FileName,
                                   pCurrentObject->FileId.Cell,
                                   pCurrentObject->FileId.Volume,
                                   pCurrentObject->FileId.Vnode,
-                                  pCurrentObject->FileId.Unique);
+                                  pCurrentObject->FileId.Unique));
 
                     //
                     // Go retrieve the target entry for this node
@@ -866,81 +1012,101 @@ AFSLocateNameEntry( IN GUID *AuthGroup,
                     // Also decrement the ref count on the volume
                     //
 
-                    ASSERT( pCurrentVolume->VolumeReferenceCount > 1);
-
-                    lCount = InterlockedDecrement( &pCurrentVolume->VolumeReferenceCount);
-
-                    AFSDbgLogMsg( AFS_SUBSYSTEM_VOLUME_REF_COUNTING,
-                                  AFS_TRACE_LEVEL_VERBOSE,
-                                  "AFSLocateNameEntry Decrement2 count on volume %08lX Cnt %d\n",
-                                  pCurrentVolume,
-                                  pCurrentVolume->VolumeReferenceCount);
-
                     ntStatus = AFSBuildMountPointTarget( AuthGroup,
                                                          pDirEntry,
-                                                         &pCurrentVolume);
+                                                         &pTargetVolume);
 
                     if( !NT_SUCCESS( ntStatus))
                     {
 
-                        AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                        AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                       AFS_TRACE_LEVEL_ERROR,
-                                      "AFSLocateNameEntry (FO: %08lX) Failed to build MP target for parent %wZ FID %08lX-%08lX-%08lX-%08lX Status %08lX\n",
+                                      "AFSLocateNameEntry (FO: %p) Failed to build MP target for parent %wZ FID %08lX-%08lX-%08lX-%08lX Status %08lX\n",
                                       FileObject,
                                       &pDirEntry->NameInformation.FileName,
                                       pCurrentObject->FileId.Cell,
                                       pCurrentObject->FileId.Volume,
                                       pCurrentObject->FileId.Vnode,
                                       pCurrentObject->FileId.Unique,
-                                      ntStatus);
-
-                        //
-                        // We already decremented the current volume above
-                        //
-
-                        bReleaseCurrentVolume = FALSE;
+                                      ntStatus));
 
                         try_return( ntStatus);
                     }
 
-                    ASSERT( pCurrentVolume->VolumeReferenceCount > 1);
+                    ASSERT( pCurrentVolume->VolumeReferenceCount > 0);
 
-                    //
-                    // The name array stores both the mount point and the target.
-                    // Insert the target.
-                    //
+                    lCount = AFSVolumeDecrement( pCurrentVolume,
+                                                 VolumeReferenceReason);
 
-                    AFSInsertNextElement( pNameArray,
-                                          pCurrentVolume->DirectoryCB);
+                    AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING,
+                                  AFS_TRACE_LEVEL_VERBOSE,
+                                  "AFSLocateNameEntry Decrement2 count on volume %p Reason %u Cnt %d\n",
+                                  pCurrentVolume,
+                                  VolumeReferenceReason,
+                                  lCount));
+
+                    pCurrentVolume = pTargetVolume;
+
+                    pTargetVolume = NULL;
+
+                    ASSERT( pCurrentVolume->VolumeReferenceCount > 0);
+
+                    VolumeReferenceReason = AFS_VOLUME_REFERENCE_MOUNTPT;
 
                     //
                     // We want to restart processing here on the new parent ...
                     // Deref and ref count the entries
                     //
 
-                    lCount = InterlockedDecrement( &pDirEntry->OpenReferenceCount);
+                    lCount = InterlockedDecrement( &pDirEntry->DirOpenReferenceCount);
 
-                    AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
+                    AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
                                   AFS_TRACE_LEVEL_VERBOSE,
                                   "AFSLocateNameEntry Decrement3 count on %wZ DE %p Ccb %p Cnt %d\n",
                                   &pDirEntry->NameInformation.FileName,
                                   pDirEntry,
                                   NULL,
-                                  lCount);
+                                  lCount));
+
+                    ASSERT( lCount >= 0);
 
                     pDirEntry = pCurrentVolume->DirectoryCB;
 
-                    lCount = InterlockedIncrement( &pDirEntry->OpenReferenceCount);
+                    pCurrentObject = pDirEntry->ObjectInformation;
+
+                    lCount = InterlockedIncrement( &pDirEntry->DirOpenReferenceCount);
 
-                    AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
+                    AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
                                   AFS_TRACE_LEVEL_VERBOSE,
                                   "AFSLocateNameEntry Increment3 count on %wZ DE %p Ccb %p Cnt %d\n",
                                   &pDirEntry->NameInformation.FileName,
                                   pDirEntry,
                                   NULL,
-                                  lCount);
+                                  lCount));
 
-                    pParentDirEntry = NULL;
+                    //
+                    // The name array stores both the mount point and the target.
+                    // Insert the target.
+                    //
+
+                    AFSInsertNextElement( pNameArray,
+                                          pDirEntry);
+
+                    if ( pParentDirEntry)
+                    {
+
+                        lCount = InterlockedDecrement( &pParentDirEntry->DirOpenReferenceCount);
+
+                        AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
+                                      AFS_TRACE_LEVEL_VERBOSE,
+                                      "AFSLocateNameEntry Decrement count on %wZ DE %p Ccb %p Cnt %d\n",
+                                      &pParentDirEntry->NameInformation.FileName,
+                                      pParentDirEntry,
+                                      NULL,
+                                      lCount));
+
+                        pParentDirEntry = NULL;
+                    }
 
                     //
                     // Increment our link count
@@ -961,11 +1127,19 @@ AFSLocateNameEntry( IN GUID *AuthGroup,
                         // Pass back the directory entries
                         //
 
-                        *ParentDirectoryCB = pParentDirEntry;
+                        *OutParentDirectoryCB = pParentDirEntry;
+
+                        pParentDirEntry = NULL;
+
+                        *OutDirectoryCB = pDirEntry;
 
-                        *DirectoryCB = pDirEntry;
+                        pDirEntry = NULL;
 
-                        *VolumeCB = pCurrentVolume;
+                        *OutVolumeCB = pCurrentVolume;
+
+                        *OutVolumeReferenceReason = VolumeReferenceReason;
+
+                        bReleaseCurrentVolume = FALSE;
 
                         *RootPathName = uniFullPathName;
 
@@ -1000,16 +1174,16 @@ AFSLocateNameEntry( IN GUID *AuthGroup,
                         ntStatus != STATUS_REPARSE)
                     {
 
-                        AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                        AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                       AFS_TRACE_LEVEL_ERROR,
-                                      "AFSLocateNameEntry (FO: %08lX) Failed to process DFSLink parent %wZ FID %08lX-%08lX-%08lX-%08lX Status %08lX\n",
+                                      "AFSLocateNameEntry (FO: %p) Failed to process DFSLink parent %wZ FID %08lX-%08lX-%08lX-%08lX Status %08lX\n",
                                       FileObject,
                                       &pDirEntry->NameInformation.FileName,
                                       pCurrentObject->FileId.Cell,
                                       pCurrentObject->FileId.Volume,
                                       pCurrentObject->FileId.Vnode,
                                       pCurrentObject->FileId.Unique,
-                                      ntStatus);
+                                      ntStatus));
                     }
 
                     try_return( ntStatus);
@@ -1033,18 +1207,19 @@ AFSLocateNameEntry( IN GUID *AuthGroup,
             //
 
             if( pCurrentObject->FileType == AFS_FILE_TYPE_DIRECTORY &&
-                !BooleanFlagOn( pCurrentObject->Flags, AFS_OBJECT_FLAGS_DIRECTORY_ENUMERATED))
+                !BooleanFlagOn( pCurrentObject->Flags, AFS_OBJECT_FLAGS_DIRECTORY_ENUMERATED) &&
+                uniPathName.Length > 0)
             {
 
-                AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                               AFS_TRACE_LEVEL_VERBOSE,
-                              "AFSLocateNameEntry (FO: %08lX) Enumerating parent %wZ FID %08lX-%08lX-%08lX-%08lX\n",
+                              "AFSLocateNameEntry (FO: %p) Enumerating parent %wZ FID %08lX-%08lX-%08lX-%08lX\n",
                               FileObject,
                               &pDirEntry->NameInformation.FileName,
                               pCurrentObject->FileId.Cell,
                               pCurrentObject->FileId.Volume,
                               pCurrentObject->FileId.Vnode,
-                              pCurrentObject->FileId.Unique);
+                              pCurrentObject->FileId.Unique));
 
                 AFSAcquireExcl( pCurrentObject->Specific.Directory.DirectoryNodeHdr.TreeLock,
                                 TRUE);
@@ -1061,21 +1236,19 @@ AFSLocateNameEntry( IN GUID *AuthGroup,
 
                         AFSReleaseResource( pCurrentObject->Specific.Directory.DirectoryNodeHdr.TreeLock);
 
-                        AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                        AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                       AFS_TRACE_LEVEL_ERROR,
-                                      "AFSLocateNameEntry (FO: %08lX) Failed to enumerate parent %wZ FID %08lX-%08lX-%08lX-%08lX Status %08lX\n",
+                                      "AFSLocateNameEntry (FO: %p) Failed to enumerate parent %wZ FID %08lX-%08lX-%08lX-%08lX Status %08lX\n",
                                       FileObject,
                                       &pDirEntry->NameInformation.FileName,
                                       pCurrentObject->FileId.Cell,
                                       pCurrentObject->FileId.Volume,
                                       pCurrentObject->FileId.Vnode,
                                       pCurrentObject->FileId.Unique,
-                                      ntStatus);
+                                      ntStatus));
 
                         try_return( ntStatus);
                     }
-
-                    SetFlag( pDirEntry->ObjectInformation->Flags, AFS_OBJECT_FLAGS_DIRECTORY_ENUMERATED);
                 }
 
                 AFSReleaseResource( pCurrentObject->Specific.Directory.DirectoryNodeHdr.TreeLock);
@@ -1086,15 +1259,15 @@ AFSLocateNameEntry( IN GUID *AuthGroup,
                 if( uniPathName.Length > 0)
                 {
 
-                    AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                    AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                   AFS_TRACE_LEVEL_ERROR,
-                                  "AFSLocateNameEntry (FO: %08lX) Encountered file node %wZ FID %08lX-%08lX-%08lX-%08lX in path processing\n",
+                                  "AFSLocateNameEntry (FO: %p) Encountered file node %wZ FID %08lX-%08lX-%08lX-%08lX in path processing\n",
                                   FileObject,
                                   &pDirEntry->NameInformation.FileName,
                                   pCurrentObject->FileId.Cell,
                                   pCurrentObject->FileId.Volume,
                                   pCurrentObject->FileId.Vnode,
-                                  pCurrentObject->FileId.Unique);
+                                  pCurrentObject->FileId.Unique));
 
                     // The proper error code to return would be STATUS_OBJECT_PATH_INVALID because
                     // one of the components of the path is not a directory.  However, returning
@@ -1108,25 +1281,33 @@ AFSLocateNameEntry( IN GUID *AuthGroup,
                 else
                 {
 
-                    AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                    AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                   AFS_TRACE_LEVEL_VERBOSE,
-                                  "AFSLocateNameEntry (FO: %08lX) Returning file %wZ FID %08lX-%08lX-%08lX-%08lX\n",
+                                  "AFSLocateNameEntry (FO: %p) Returning file %wZ FID %08lX-%08lX-%08lX-%08lX\n",
                                   FileObject,
                                   &pDirEntry->NameInformation.FileName,
                                   pCurrentObject->FileId.Cell,
                                   pCurrentObject->FileId.Volume,
                                   pCurrentObject->FileId.Vnode,
-                                  pCurrentObject->FileId.Unique);
+                                  pCurrentObject->FileId.Unique));
 
                     //
                     // Pass back the directory entries
                     //
 
-                    *ParentDirectoryCB = pParentDirEntry;
+                    *OutParentDirectoryCB = pParentDirEntry;
+
+                    pParentDirEntry = NULL;
 
-                    *DirectoryCB = pDirEntry;
+                    *OutDirectoryCB = pDirEntry;
 
-                    *VolumeCB = pCurrentVolume;
+                    pDirEntry = NULL;
+
+                    *OutVolumeCB = pCurrentVolume;
+
+                    *OutVolumeReferenceReason = VolumeReferenceReason;
+
+                    bReleaseCurrentVolume = FALSE;
 
                     *RootPathName = uniFullPathName;
                 }
@@ -1141,25 +1322,33 @@ AFSLocateNameEntry( IN GUID *AuthGroup,
             if( uniPathName.Length == 0)
             {
 
-                AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                               AFS_TRACE_LEVEL_VERBOSE,
-                              "AFSLocateNameEntry (FO: %08lX) Completed processing returning %wZ FID %08lX-%08lX-%08lX-%08lX\n",
+                              "AFSLocateNameEntry (FO: %p) Completed processing returning %wZ FID %08lX-%08lX-%08lX-%08lX\n",
                               FileObject,
                               &pDirEntry->NameInformation.FileName,
                               pCurrentObject->FileId.Cell,
                               pCurrentObject->FileId.Volume,
                               pCurrentObject->FileId.Vnode,
-                              pCurrentObject->FileId.Unique);
+                              pCurrentObject->FileId.Unique));
 
                 //
                 // Pass back the directory entries
                 //
 
-                *ParentDirectoryCB = pParentDirEntry;
+                *OutParentDirectoryCB = pParentDirEntry;
+
+                pParentDirEntry = NULL;
+
+                *OutDirectoryCB = pDirEntry;
 
-                *DirectoryCB = pDirEntry;
+                pDirEntry = NULL;
 
-                *VolumeCB = pCurrentVolume;
+                *OutVolumeCB = pCurrentVolume;
+
+                *OutVolumeReferenceReason = VolumeReferenceReason;
+
+                bReleaseCurrentVolume = FALSE;
 
                 *RootPathName = uniFullPathName;
 
@@ -1212,63 +1401,120 @@ AFSLocateNameEntry( IN GUID *AuthGroup,
                                          TRUE) == 0)
             {
 
-                AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                               AFS_TRACE_LEVEL_VERBOSE,
-                              "AFSLocateNameEntry (FO: %08lX) Backing up entry from %wZ FID %08lX-%08lX-%08lX-%08lX\n",
+                              "AFSLocateNameEntry (FO: %p) Backing up entry from %wZ FID %08lX-%08lX-%08lX-%08lX\n",
                               FileObject,
                               &pDirEntry->NameInformation.FileName,
                               pCurrentObject->FileId.Cell,
                               pCurrentObject->FileId.Volume,
                               pCurrentObject->FileId.Vnode,
-                              pCurrentObject->FileId.Unique);
+                              pCurrentObject->FileId.Unique));
 
                 //
                 // Need to back up one entry in the name array
                 //
-                lCount = InterlockedDecrement( &pDirEntry->OpenReferenceCount);
+                lCount = InterlockedDecrement( &pDirEntry->DirOpenReferenceCount);
 
-                AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
+                AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
                               AFS_TRACE_LEVEL_VERBOSE,
                               "AFSLocateNameEntry Decrement4 count on %wZ DE %p Ccb %p Cnt %d\n",
                               &pDirEntry->NameInformation.FileName,
                               pDirEntry,
                               NULL,
-                              lCount);
+                              lCount));
+
+                ASSERT( lCount >= 0);
 
                 pDirEntry = AFSBackupEntry( NameArray);
 
                 if( pDirEntry == NULL)
                 {
 
-                    AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                    AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                   AFS_TRACE_LEVEL_ERROR,
-                                  "AFSLocateNameEntry AFSBackupEntry failed\n");
+                                  "AFSLocateNameEntry AFSBackupEntry failed\n"));
 
                     try_return(ntStatus = STATUS_OBJECT_PATH_INVALID);
                 }
 
-                lCount = InterlockedIncrement( &pDirEntry->OpenReferenceCount);
+                pCurrentObject = pDirEntry->ObjectInformation;
 
-                if( BooleanFlagOn( pDirEntry->ObjectInformation->Flags, AFS_OBJECT_ROOT_VOLUME))
+                lCount = InterlockedIncrement( &pDirEntry->DirOpenReferenceCount);
+
+                AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
+                              AFS_TRACE_LEVEL_VERBOSE,
+                              "AFSLocateNameEntry Increment4 count on %wZ DE %p Ccb %p Cnt %d\n",
+                              &pDirEntry->NameInformation.FileName,
+                              pDirEntry,
+                              NULL,
+                              lCount));
+
+                if ( pParentDirEntry)
                 {
 
+                    lCount = InterlockedDecrement( &pParentDirEntry->DirOpenReferenceCount);
+
+                    AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
+                                  AFS_TRACE_LEVEL_VERBOSE,
+                                  "AFSLocateNameEntry Decrement count on %wZ DE %p Ccb %p Cnt %d\n",
+                                  &pParentDirEntry->NameInformation.FileName,
+                                  pParentDirEntry,
+                                  NULL,
+                                  lCount));
+
                     pParentDirEntry = NULL;
                 }
-                else
+
+                if( !BooleanFlagOn( pDirEntry->ObjectInformation->Flags, AFS_OBJECT_ROOT_VOLUME))
                 {
 
                     pParentDirEntry = AFSGetParentEntry( pNameArray);
 
                     ASSERT( pParentDirEntry != pDirEntry);
+
+                    if ( pParentDirEntry)
+                    {
+
+                        lCount = InterlockedIncrement( &pParentDirEntry->DirOpenReferenceCount);
+
+                        AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
+                                      AFS_TRACE_LEVEL_VERBOSE,
+                                      "AFSLocateNameEntry Increment count on %wZ DE %p Ccb %p Cnt %d\n",
+                                      &pParentDirEntry->NameInformation.FileName,
+                                      pParentDirEntry,
+                                      NULL,
+                                      lCount));
+                    }
                 }
 
-                AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
-                              AFS_TRACE_LEVEL_VERBOSE,
-                              "AFSLocateNameEntry Increment4 count on %wZ DE %p Ccb %p Cnt %d\n",
-                              &pDirEntry->NameInformation.FileName,
-                              pDirEntry,
-                              NULL,
-                              pDirEntry->OpenReferenceCount);
+                if ( pDirEntry->ObjectInformation->VolumeCB != pCurrentVolume)
+                {
+
+                    lCount = AFSVolumeDecrement( pCurrentVolume,
+                                                 VolumeReferenceReason);
+
+                    AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING,
+                                  AFS_TRACE_LEVEL_VERBOSE,
+                                  "AFSLocateNameEntry Decrement count on volume %p Reason %u Cnt %d\n",
+                                  pCurrentVolume,
+                                  VolumeReferenceReason,
+                                  lCount));
+
+                    pCurrentVolume = pDirEntry->ObjectInformation->VolumeCB;
+
+                    VolumeReferenceReason = AFS_VOLUME_REFERENCE_LOCATE_NAME;
+
+                    lCount = AFSVolumeIncrement( pCurrentVolume,
+                                                 VolumeReferenceReason);
+
+                    AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING,
+                                  AFS_TRACE_LEVEL_VERBOSE,
+                                  "AFSLocateNameEntry Increment count on volume %p Reason %u Cnt %d\n",
+                                  pCurrentVolume,
+                                  VolumeReferenceReason,
+                                  lCount));
+                }
 
                 uniPathName = uniRemainingPath;
 
@@ -1279,10 +1525,26 @@ AFSLocateNameEntry( IN GUID *AuthGroup,
             // Update our pointers
             //
 
+            if ( pParentDirEntry)
+            {
+
+                lCount = InterlockedDecrement( &pParentDirEntry->DirOpenReferenceCount);
+
+                AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
+                              AFS_TRACE_LEVEL_VERBOSE,
+                              "AFSLocateNameEntry Decrement count on %wZ DE %p Ccb %p Cnt %d\n",
+                              &pParentDirEntry->NameInformation.FileName,
+                              pParentDirEntry,
+                              NULL,
+                              lCount));
+            }
+
             pParentDirEntry = pDirEntry;
 
             pDirEntry = NULL;
 
+            pCurrentObject = NULL;
+
             uniSearchName = uniComponentName;
 
             while( pDirEntry == NULL)
@@ -1300,12 +1562,12 @@ AFSLocateNameEntry( IN GUID *AuthGroup,
                                              NULL))
                 {
 
-                    AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                    AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                   AFS_TRACE_LEVEL_VERBOSE_2,
-                                  "AFSLocateNameEntry (FO: %08lX) Processing @SYS substitution for %wZ Index %08lX\n",
+                                  "AFSLocateNameEntry (FO: %p) Processing @SYS substitution for %wZ Index %08lX\n",
                                   FileObject,
                                   &uniComponentName,
-                                  ulSubstituteIndex);
+                                  ulSubstituteIndex));
 
                     ntStatus = AFSSubstituteSysName( &uniComponentName,
                                                      &uniSearchName,
@@ -1314,13 +1576,13 @@ AFSLocateNameEntry( IN GUID *AuthGroup,
                     if ( NT_SUCCESS( ntStatus))
                     {
 
-                        AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                        AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                       AFS_TRACE_LEVEL_VERBOSE_2,
-                                      "AFSLocateNameEntry (FO: %08lX) Located substitution %wZ for %wZ Index %08lX\n",
+                                      "AFSLocateNameEntry (FO: %p) Located substitution %wZ for %wZ Index %08lX\n",
                                       FileObject,
                                       &uniSearchName,
                                       &uniComponentName,
-                                      ulSubstituteIndex);
+                                      ulSubstituteIndex));
 
                         //
                         // Go reparse the name again
@@ -1335,13 +1597,13 @@ AFSLocateNameEntry( IN GUID *AuthGroup,
                     else
                     {
 
-                        AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                        AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                       AFS_TRACE_LEVEL_ERROR,
-                                      "AFSLocateNameEntry (FO: %08lX) Failed to locate substitute string for %wZ Index %08lX Status %08lX\n",
+                                      "AFSLocateNameEntry (FO: %p) Failed to locate substitute string for %wZ Index %08lX Status %08lX\n",
                                       FileObject,
                                       &uniComponentName,
                                       ulSubstituteIndex,
-                                      ntStatus);
+                                      ntStatus));
 
                         if( ntStatus == STATUS_OBJECT_NAME_NOT_FOUND)
                         {
@@ -1350,11 +1612,17 @@ AFSLocateNameEntry( IN GUID *AuthGroup,
                             // Pass back the directory entries
                             //
 
-                            *ParentDirectoryCB = pParentDirEntry;
+                            *OutParentDirectoryCB = pParentDirEntry;
 
-                            *DirectoryCB = NULL;
+                            pParentDirEntry = NULL;
 
-                            *VolumeCB = pCurrentVolume;
+                            *OutDirectoryCB = NULL;
+
+                            *OutVolumeCB = pCurrentVolume;
+
+                            *OutVolumeReferenceReason = VolumeReferenceReason;
+
+                            bReleaseCurrentVolume = FALSE;
 
                             if( ComponentName != NULL)
                             {
@@ -1376,11 +1644,11 @@ AFSLocateNameEntry( IN GUID *AuthGroup,
                 // Generate the CRC on the node and perform a case sensitive lookup
                 //
 
-                AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                               AFS_TRACE_LEVEL_VERBOSE_2,
-                              "AFSLocateNameEntry (FO: %08lX) Searching for entry %wZ case sensitive\n",
+                              "AFSLocateNameEntry (FO: %p) Searching for entry %wZ case sensitive\n",
                               FileObject,
-                              &uniSearchName);
+                              &uniSearchName));
 
                 ulCRC = AFSGenerateCRC( &uniSearchName,
                                         FALSE);
@@ -1399,11 +1667,11 @@ AFSLocateNameEntry( IN GUID *AuthGroup,
                     // Missed so perform a case insensitive lookup
                     //
 
-                    AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                    AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                   AFS_TRACE_LEVEL_VERBOSE_2,
-                                  "AFSLocateNameEntry (FO: %08lX) Searching for entry %wZ case insensitive\n",
+                                  "AFSLocateNameEntry (FO: %p) Searching for entry %wZ case insensitive\n",
                                   FileObject,
-                                  &uniSearchName);
+                                  &uniSearchName));
 
                     ulCRC = AFSGenerateCRC( &uniSearchName,
                                             TRUE);
@@ -1426,17 +1694,37 @@ AFSLocateNameEntry( IN GUID *AuthGroup,
                                                     NULL))
                         {
 
-                            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                            AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                           AFS_TRACE_LEVEL_VERBOSE_2,
-                                          "AFSLocateNameEntry (FO: %08lX) Searching for entry %wZ short name\n",
+                                          "AFSLocateNameEntry (FO: %p) Searching for entry %wZ short name\n",
                                           FileObject,
-                                          &uniSearchName);
+                                          &uniSearchName));
 
                             AFSLocateShortNameDirEntry( pParentDirEntry->ObjectInformation->Specific.Directory.ShortNameTree,
                                                         ulCRC,
                                                         &pDirEntry);
                         }
 
+                        if ( pDirEntry == NULL &&
+                             pParentDirEntry->ObjectInformation->VolumeCB == AFSGlobalRoot)
+                        {
+
+                            //
+                            // Check with the service to see if this is a valid cell name
+                            // that can be automatically resolved.  Drop the shared TreeLock
+                            // since AFSCheckCellName must acquire it exclusively.
+                            //
+
+                            AFSReleaseResource( pParentDirEntry->ObjectInformation->Specific.Directory.DirectoryNodeHdr.TreeLock);
+
+                            ntStatus = AFSCheckCellName( AuthGroup,
+                                                         &uniSearchName,
+                                                         &pDirEntry);
+
+                            AFSAcquireShared( pParentDirEntry->ObjectInformation->Specific.Directory.DirectoryNodeHdr.TreeLock,
+                                              TRUE);
+                        }
+
                         if( pDirEntry == NULL)
                         {
 
@@ -1458,35 +1746,57 @@ AFSLocateNameEntry( IN GUID *AuthGroup,
                                 continue;       // while( pDirEntry == NULL)
                             }
 
+                            //
+                            // Node name not found so get out
+                            //
+
+                            AFSReleaseResource( pParentDirEntry->ObjectInformation->Specific.Directory.DirectoryNodeHdr.TreeLock);
+
                             if( uniRemainingPath.Length > 0)
                             {
 
                                 ntStatus = STATUS_OBJECT_PATH_NOT_FOUND;
+
+                                AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
+                                              AFS_TRACE_LEVEL_VERBOSE,
+                                              "AFSLocateNameEntry (FO: %p) Returning path not found for %wZ in Parent FID %08lX-%08lX-%08lX-%08lX\n",
+                                              FileObject,
+                                              &uniSearchName,
+                                              pParentDirEntry->ObjectInformation->FileId.Cell,
+                                              pParentDirEntry->ObjectInformation->FileId.Volume,
+                                              pParentDirEntry->ObjectInformation->FileId.Vnode,
+                                              pParentDirEntry->ObjectInformation->FileId.Unique));
                             }
                             else
                             {
 
                                 ntStatus = STATUS_OBJECT_NAME_NOT_FOUND;
 
-                                AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                                AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                               AFS_TRACE_LEVEL_VERBOSE,
-                                              "AFSLocateNameEntry (FO: %08lX) Returning name not found for %wZ FID %08lX-%08lX-%08lX-%08lX\n",
+                                              "AFSLocateNameEntry (FO: %p) Returning name not found for %wZ in Parent FID %08lX-%08lX-%08lX-%08lX\n",
                                               FileObject,
                                               &uniSearchName,
-                                              pCurrentObject->FileId.Cell,
-                                              pCurrentObject->FileId.Volume,
-                                              pCurrentObject->FileId.Vnode,
-                                              pCurrentObject->FileId.Unique);
+                                              pParentDirEntry->ObjectInformation->FileId.Cell,
+                                              pParentDirEntry->ObjectInformation->FileId.Volume,
+                                              pParentDirEntry->ObjectInformation->FileId.Vnode,
+                                              pParentDirEntry->ObjectInformation->FileId.Unique));
 
                                 //
                                 // Pass back the directory entries
                                 //
 
-                                *ParentDirectoryCB = pParentDirEntry;
+                                *OutParentDirectoryCB = pParentDirEntry;
+
+                                pParentDirEntry = NULL;
+
+                                *OutDirectoryCB = NULL;
+
+                                *OutVolumeCB = pCurrentVolume;
 
-                                *DirectoryCB = NULL;
+                                *OutVolumeReferenceReason = VolumeReferenceReason;
 
-                                *VolumeCB = pCurrentVolume;
+                                bReleaseCurrentVolume = FALSE;
 
                                 if( ComponentName != NULL)
                                 {
@@ -1497,13 +1807,7 @@ AFSLocateNameEntry( IN GUID *AuthGroup,
                                 *RootPathName = uniFullPathName;
                             }
 
-                            AFSReleaseResource( pParentDirEntry->ObjectInformation->Specific.Directory.DirectoryNodeHdr.TreeLock);
-
-                            //
-                            // Node name not found so get out
-                            //
-
-                            try_return( ntStatus);  // while( pDirEntry == NULL)
+                            try_return( ntStatus);
                         }
                     }
                     else
@@ -1514,10 +1818,26 @@ AFSLocateNameEntry( IN GUID *AuthGroup,
                         // Is more than one link entry for this node then fail the lookup request
                         //
 
+                        pCurrentObject = pDirEntry->ObjectInformation;
+
                         if( !BooleanFlagOn( pDirEntry->Flags, AFS_DIR_ENTRY_CASE_INSENSTIVE_LIST_HEAD) ||
                             pDirEntry->CaseInsensitiveList.fLink != NULL)
                         {
 
+                            //
+                            // Increment our dir entry ref count since we will decrement it on exit
+                            //
+
+                            lCount = InterlockedIncrement( &pDirEntry->DirOpenReferenceCount);
+
+                            AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
+                                          AFS_TRACE_LEVEL_VERBOSE,
+                                          "AFSLocateNameEntry Increment5 count on %wZ DE %p Ccb %p Cnt %d\n",
+                                          &pDirEntry->NameInformation.FileName,
+                                          pDirEntry,
+                                          NULL,
+                                          lCount));
+
                             AFSReleaseResource( pParentDirEntry->ObjectInformation->Specific.Directory.DirectoryNodeHdr.TreeLock);
 
                             try_return(ntStatus = STATUS_OBJECT_NAME_COLLISION);
@@ -1533,21 +1853,23 @@ AFSLocateNameEntry( IN GUID *AuthGroup,
                     // revalidate the parent and search again.
                     //
 
+                    pCurrentObject = pDirEntry->ObjectInformation;
+
                     if( BooleanFlagOn( pDirEntry->ObjectInformation->Flags, AFS_OBJECT_FLAGS_DELETED) &&
                         BooleanFlagOn( pParentDirEntry->ObjectInformation->Flags, AFS_OBJECT_FLAGS_VERIFY))
                     {
 
                         AFSReleaseResource( pParentDirEntry->ObjectInformation->Specific.Directory.DirectoryNodeHdr.TreeLock);
 
-                        AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                        AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                       AFS_TRACE_LEVEL_VERBOSE,
-                                      "AFSLocateNameEntry (FO: %08lX) Verifying(2) parent %wZ FID %08lX-%08lX-%08lX-%08lX\n",
+                                      "AFSLocateNameEntry (FO: %p) Verifying(2) parent %wZ FID %08lX-%08lX-%08lX-%08lX\n",
                                       FileObject,
                                       &pParentDirEntry->NameInformation.FileName,
                                       pParentDirEntry->ObjectInformation->FileId.Cell,
                                       pParentDirEntry->ObjectInformation->FileId.Volume,
                                       pParentDirEntry->ObjectInformation->FileId.Vnode,
-                                      pParentDirEntry->ObjectInformation->FileId.Unique);
+                                      pParentDirEntry->ObjectInformation->FileId.Unique));
 
                         //
                         // Directory TreeLock should be exclusively held
@@ -1564,30 +1886,32 @@ AFSLocateNameEntry( IN GUID *AuthGroup,
                         if( !NT_SUCCESS( ntStatus))
                         {
 
-                            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                            AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                           AFS_TRACE_LEVEL_ERROR,
-                                          "AFSLocateNameEntry (FO: %08lX) Failed to verify(2) parent %wZ FID %08lX-%08lX-%08lX-%08lX Status %08lX\n",
+                                          "AFSLocateNameEntry (FO: %p) Failed to verify(2) parent %wZ FID %08lX-%08lX-%08lX-%08lX Status %08lX\n",
                                           FileObject,
                                           &pParentDirEntry->NameInformation.FileName,
                                           pParentDirEntry->ObjectInformation->FileId.Cell,
                                           pParentDirEntry->ObjectInformation->FileId.Volume,
                                           pParentDirEntry->ObjectInformation->FileId.Vnode,
                                           pParentDirEntry->ObjectInformation->FileId.Unique,
-                                          ntStatus);
+                                          ntStatus));
 
                             try_return( ntStatus);
                         }
 
-                        AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                        AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                       AFS_TRACE_LEVEL_VERBOSE,
-                                      "AFSLocateNameEntry (FO: %08lX) Reprocessing component %wZ in parent %wZ\n",
+                                      "AFSLocateNameEntry (FO: %p) Reprocessing component %wZ in parent %wZ\n",
                                       FileObject,
                                       &uniSearchName,
-                                      &pParentDirEntry->NameInformation.FileName);
+                                      &pParentDirEntry->NameInformation.FileName));
 
 
                         pDirEntry = NULL;
 
+                        pCurrentObject = NULL;
+
                         continue;
                     }
 
@@ -1595,15 +1919,15 @@ AFSLocateNameEntry( IN GUID *AuthGroup,
                     // Increment our dir entry ref count
                     //
 
-                    lCount = InterlockedIncrement( &pDirEntry->OpenReferenceCount);
+                    lCount = InterlockedIncrement( &pDirEntry->DirOpenReferenceCount);
 
-                    AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
+                    AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
                                   AFS_TRACE_LEVEL_VERBOSE,
-                                  "AFSLocateNameEntry Increment5 count on %wZ DE %p Ccb %p Cnt %d\n",
+                                  "AFSLocateNameEntry Increment6 count on %wZ DE %p Ccb %p Cnt %d\n",
                                   &pDirEntry->NameInformation.FileName,
                                   pDirEntry,
                                   NULL,
-                                  lCount);
+                                  lCount));
                 }
 
                 AFSReleaseResource( pParentDirEntry->ObjectInformation->Specific.Directory.DirectoryNodeHdr.TreeLock);
@@ -1614,139 +1938,180 @@ AFSLocateNameEntry( IN GUID *AuthGroup,
             // If we have a dirEntry for this component, perform some basic validation on it
             //
 
-            if( pDirEntry != NULL &&
-                BooleanFlagOn( pDirEntry->ObjectInformation->Flags, AFS_OBJECT_FLAGS_DELETED))
+            if( pDirEntry != NULL)
             {
 
                 pCurrentObject = pDirEntry->ObjectInformation;
 
-                AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
-                              AFS_TRACE_LEVEL_ERROR,
-                              "AFSLocateNameEntry (FO: %08lX) Deleted entry %wZ FID %08lX-%08lX-%08lX-%08lX\n",
-                              FileObject,
-                              &pDirEntry->NameInformation.FileName,
-                              pCurrentObject->FileId.Cell,
-                              pCurrentObject->FileId.Volume,
-                              pCurrentObject->FileId.Vnode,
-                              pCurrentObject->FileId.Unique);
+                if (BooleanFlagOn( pDirEntry->ObjectInformation->Flags, AFS_OBJECT_FLAGS_DELETED))
+                {
 
-                //
-                // This entry was deleted through the invalidation call back so perform cleanup
-                // on the entry
-                //
+                    AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
+                                  AFS_TRACE_LEVEL_ERROR,
+                                  "AFSLocateNameEntry (FO: %p) Deleted entry %wZ FID %08lX-%08lX-%08lX-%08lX\n",
+                                  FileObject,
+                                  &pDirEntry->NameInformation.FileName,
+                                  pCurrentObject->FileId.Cell,
+                                  pCurrentObject->FileId.Volume,
+                                  pCurrentObject->FileId.Vnode,
+                                  pCurrentObject->FileId.Unique));
+
+                    //
+                    // This entry was deleted through the invalidation call back so perform cleanup
+                    // on the entry
+                    //
+
+                    if( BooleanFlagOn( pCurrentObject->Flags, AFS_OBJECT_FLAGS_PARENT_FID))
+                    {
+
+                        pParentObjectInfo = AFSFindObjectInfo( pCurrentObject->VolumeCB,
+                                                               &pCurrentObject->ParentFileId,
+                                                               FALSE);
+                    }
+
+                    ASSERT( pParentObjectInfo != NULL);
+
+                    AFSAcquireExcl( pParentObjectInfo->Specific.Directory.DirectoryNodeHdr.TreeLock,
+                                    TRUE);
+
+                    AFSAcquireExcl( pCurrentObject->VolumeCB->ObjectInfoTree.TreeLock,
+                                    TRUE);
+
+                    lCount = InterlockedDecrement( &pDirEntry->DirOpenReferenceCount);
+
+                    AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
+                                  AFS_TRACE_LEVEL_VERBOSE,
+                                  "AFSLocateNameEntry Decrement count on %wZ DE %p Ccb %p Cnt %d\n",
+                                  &pDirEntry->NameInformation.FileName,
+                                  pDirEntry,
+                                  NULL,
+                                  lCount));
 
-                pParentObjectInfo = pCurrentObject->ParentObjectInformation;
+                    ASSERT( lCount >= 0);
+
+                    if( lCount == 0 &&
+                        pDirEntry->NameArrayReferenceCount <= 0)
+                    {
 
-                ASSERT( pParentObjectInfo != NULL);
+                        AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING|AFS_SUBSYSTEM_CLEANUP_PROCESSING,
+                                      AFS_TRACE_LEVEL_VERBOSE,
+                                      "AFSLocateNameEntry Deleting dir entry %p (%p) for %wZ\n",
+                                      pDirEntry,
+                                      pCurrentObject,
+                                      &pDirEntry->NameInformation.FileName));
+
+                        //
+                        // Remove and delete the directory entry from the parent list
+                        //
+
+                        AFSDeleteDirEntry( pParentObjectInfo,
+                                           &pDirEntry);
+
+                        AFSAcquireShared( &pCurrentObject->NonPagedInfo->ObjectInfoLock,
+                                          TRUE);
+
+                        if( pCurrentObject->ObjectReferenceCount <= 0)
+                        {
+
+                            if( BooleanFlagOn( pCurrentObject->Flags, AFS_OBJECT_INSERTED_HASH_TREE))
+                            {
+
+                                AFSDbgTrace(( AFS_SUBSYSTEM_CLEANUP_PROCESSING,
+                                              AFS_TRACE_LEVEL_VERBOSE,
+                                              "AFSLocateNameEntry Removing object %p from volume tree\n",
+                                              pCurrentObject));
+
+                                AFSRemoveHashEntry( &pCurrentObject->VolumeCB->ObjectInfoTree.TreeHead,
+                                                    &pCurrentObject->TreeEntry);
+
+                                ClearFlag( pCurrentObject->Flags, AFS_OBJECT_INSERTED_HASH_TREE);
+                            }
+                        }
+
+                        AFSReleaseResource( &pCurrentObject->NonPagedInfo->ObjectInfoLock);
+                    }
+                    else
+                    {
 
-                AFSAcquireExcl( pParentObjectInfo->Specific.Directory.DirectoryNodeHdr.TreeLock,
-                                TRUE);
+                        AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
+                                      AFS_TRACE_LEVEL_VERBOSE,
+                                      "AFSLocateNameEntry Setting DELETE flag in dir entry %p for %wZ\n",
+                                      pDirEntry,
+                                      &pDirEntry->NameInformation.FileName));
 
-                AFSAcquireExcl( pCurrentObject->VolumeCB->ObjectInfoTree.TreeLock,
-                                TRUE);
+                        SetFlag( pDirEntry->Flags, AFS_DIR_ENTRY_DELETED);
 
-                lCount = InterlockedDecrement( &pDirEntry->OpenReferenceCount);
+                        AFSRemoveNameEntry( pParentObjectInfo,
+                                            pDirEntry);
+                    }
 
-                if( lCount == 0)
-                {
+                    AFSReleaseResource( pParentObjectInfo->Specific.Directory.DirectoryNodeHdr.TreeLock);
 
-                    AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING|AFS_SUBSYSTEM_CLEANUP_PROCESSING,
-                                  AFS_TRACE_LEVEL_VERBOSE,
-                                  "AFSLocateNameEntry Deleting dir entry %08lX (%08lX) for %wZ\n",
-                                  pDirEntry,
-                                  pCurrentObject,
-                                  &pDirEntry->NameInformation.FileName);
+                    AFSReleaseResource( pCurrentObject->VolumeCB->ObjectInfoTree.TreeLock);
 
                     //
-                    // Remove and delete the directory entry from the parent list
+                    // We deleted the dir entry so check if there is any remaining portion
+                    // of the name to process.
                     //
 
-                    AFSDeleteDirEntry( pParentObjectInfo,
-                                       pDirEntry);
-
-                    AFSAcquireShared( &pCurrentObject->NonPagedInfo->ObjectInfoLock,
-                                      TRUE);
-
-                    if( pCurrentObject->ObjectReferenceCount <= 0)
+                    if( uniRemainingPath.Length > 0)
                     {
 
-                        if( BooleanFlagOn( pCurrentObject->Flags, AFS_OBJECT_INSERTED_HASH_TREE))
-                        {
-
-                            AFSDbgLogMsg( AFS_SUBSYSTEM_CLEANUP_PROCESSING,
-                                          AFS_TRACE_LEVEL_VERBOSE,
-                                          "AFSLocateNameEntry Removing object %08lX from volume tree\n",
-                                          pCurrentObject);
+                        ntStatus = STATUS_OBJECT_PATH_NOT_FOUND;
 
-                            AFSRemoveHashEntry( &pCurrentObject->VolumeCB->ObjectInfoTree.TreeHead,
-                                                &pCurrentObject->TreeEntry);
+                        AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
+                                      AFS_TRACE_LEVEL_VERBOSE,
+                                      "AFSLocateNameEntry (FO: %p) Returning path not found(2) for %wZ in Parent FID %08lX-%08lX-%08lX-%08lX\n",
+                                      FileObject,
+                                      &uniComponentName,
+                                      pParentObjectInfo->FileId.Cell,
+                                      pParentObjectInfo->FileId.Volume,
+                                      pParentObjectInfo->FileId.Vnode,
+                                      pParentObjectInfo->FileId.Unique));
 
-                            ClearFlag( pCurrentObject->Flags, AFS_OBJECT_INSERTED_HASH_TREE);
-                        }
+                        AFSReleaseObjectInfo( &pParentObjectInfo);
                     }
+                    else
+                    {
 
-                    AFSReleaseResource( &pCurrentObject->NonPagedInfo->ObjectInfoLock);
-                }
-                else
-                {
-
-                    AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
-                                  AFS_TRACE_LEVEL_VERBOSE,
-                                  "AFSLocateNameEntry Setting DELETE flag in dir entry %p for %wZ\n",
-                                  pDirEntry,
-                                  &pDirEntry->NameInformation.FileName);
-
-                    SetFlag( pDirEntry->Flags, AFS_DIR_ENTRY_DELETED);
-
-                    AFSRemoveNameEntry( pParentObjectInfo,
-                                        pDirEntry);
-                }
+                        ntStatus = STATUS_OBJECT_NAME_NOT_FOUND;
 
-                AFSReleaseResource( pParentObjectInfo->Specific.Directory.DirectoryNodeHdr.TreeLock);
+                        AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
+                                      AFS_TRACE_LEVEL_VERBOSE,
+                                      "AFSLocateNameEntry (FO: %p) Returning name not found(2) for %wZ in Parent FID %08lX-%08lX-%08lX-%08lX\n",
+                                      FileObject,
+                                      &uniComponentName,
+                                      pParentObjectInfo->FileId.Cell,
+                                      pParentObjectInfo->FileId.Volume,
+                                      pParentObjectInfo->FileId.Vnode,
+                                      pParentObjectInfo->FileId.Unique));
 
-                AFSReleaseResource( pCurrentObject->VolumeCB->ObjectInfoTree.TreeLock);
+                        AFSReleaseObjectInfo( &pParentObjectInfo);
 
-                //
-                // We deleted the dir entry so check if there is any remaining portion
-                // of the name to process.
-                //
+                        //
+                        // Pass back the directory entries
+                        //
 
-                if( uniRemainingPath.Length > 0)
-                {
-                    ntStatus = STATUS_OBJECT_PATH_NOT_FOUND;
-                }
-                else
-                {
+                        *OutParentDirectoryCB = pParentDirEntry;
 
-                    ntStatus = STATUS_OBJECT_NAME_NOT_FOUND;
+                        pParentDirEntry = NULL;
 
-                    AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
-                                  AFS_TRACE_LEVEL_VERBOSE,
-                                  "AFSLocateNameEntry (FO: %08lX) Returning name not found(2) for %wZ FID %08lX-%08lX-%08lX-%08lX\n",
-                                  FileObject,
-                                  &uniComponentName,
-                                  pCurrentObject->FileId.Cell,
-                                  pCurrentObject->FileId.Volume,
-                                  pCurrentObject->FileId.Vnode,
-                                  pCurrentObject->FileId.Unique);
+                        *OutDirectoryCB = NULL;
 
-                    //
-                    // Pass back the directory entries
-                    //
+                        *OutVolumeCB = pCurrentVolume;
 
-                    *ParentDirectoryCB = pParentDirEntry;
+                        *OutVolumeReferenceReason = VolumeReferenceReason;
 
-                    *DirectoryCB = NULL;
+                        bReleaseCurrentVolume = FALSE;
 
-                    *VolumeCB = pCurrentVolume;
+                        if( ComponentName != NULL)
+                        {
 
-                    if( ComponentName != NULL)
-                    {
+                            *ComponentName = uniComponentName;
+                        }
 
-                        *ComponentName = uniComponentName;
+                        *RootPathName = uniFullPathName;
                     }
-
-                    *RootPathName = uniFullPathName;
                 }
             }
 
@@ -1757,20 +2122,6 @@ AFSLocateNameEntry( IN GUID *AuthGroup,
             }
 
             //
-            // Decrement the previous parent
-            //
-
-            lCount = InterlockedDecrement( &pParentDirEntry->OpenReferenceCount);
-
-            AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
-                          AFS_TRACE_LEVEL_VERBOSE,
-                          "AFSLocateNameEntry Decrement5 count on Parent %wZ DE %p Ccb %p Cnt %d\n",
-                          &pParentDirEntry->NameInformation.FileName,
-                          pParentDirEntry,
-                          NULL,
-                          lCount);
-
-            //
             // If we ended up substituting a name in the component then update
             // the full path and update the pointers
             //
@@ -1780,13 +2131,13 @@ AFSLocateNameEntry( IN GUID *AuthGroup,
 
                 BOOLEAN bRelativeOpen = FALSE;
 
-                AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                               AFS_TRACE_LEVEL_VERBOSE_2,
-                              "AFSLocateNameEntry (FO: %08lX) Substituting %wZ into %wZ Index %08lX\n",
+                              "AFSLocateNameEntry (FO: %p) Substituting %wZ into %wZ Index %08lX\n",
                               FileObject,
                               &uniSearchName,
                               &uniComponentName,
-                              ulSubstituteIndex);
+                              ulSubstituteIndex));
 
                 if( FileObject != NULL &&
                     FileObject->RelatedFileObject != NULL)
@@ -1806,20 +2157,20 @@ AFSLocateNameEntry( IN GUID *AuthGroup,
                                                     &uniSearchName,
                                                     &uniRemainingPath,
                                                     bRelativeOpen ||
-                                                            bAllocatedSymLinkBuffer ||
-                                                            bSubstitutedName);
+                                                    bAllocatedSymLinkBuffer ||
+                                                    bSubstitutedName);
 
                 if( !NT_SUCCESS( ntStatus))
                 {
 
-                    AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                    AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                   AFS_TRACE_LEVEL_ERROR,
-                                  "AFSLocateNameEntry (FO: %08lX) Failure to substitute %wZ into %wZ Index %08lX Status %08lX\n",
+                                  "AFSLocateNameEntry (FO: %p) Failure to substitute %wZ into %wZ Index %08lX Status %08lX\n",
                                   FileObject,
                                   &uniSearchName,
                                   &uniComponentName,
                                   ulSubstituteIndex,
-                                  ntStatus);
+                                  ntStatus));
 
                     try_return( ntStatus);
                 }
@@ -1844,9 +2195,8 @@ AFSLocateNameEntry( IN GUID *AuthGroup,
             //
 
             if( pCurrentObject->FileType == AFS_FILE_TYPE_SYMLINK &&
-                pCurrentObject->TargetFileId.Vnode == 0 &&
-                pCurrentObject->TargetFileId.Unique == 0 &&
-                pDirEntry->NameInformation.TargetName.Length == 0)
+                ( pCurrentObject->TargetFileId.Vnode == 0 ||
+                  pDirEntry->NameInformation.TargetName.Length == 0))
             {
 
                 ntStatus = AFSValidateSymLink( AuthGroup,
@@ -1855,16 +2205,16 @@ AFSLocateNameEntry( IN GUID *AuthGroup,
                 if( !NT_SUCCESS( ntStatus))
                 {
 
-                    AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                    AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                   AFS_TRACE_LEVEL_ERROR,
-                                  "AFSLocateNameEntry (FO: %08lX) Failed to evaluate possible DFS Link %wZ FID %08lX-%08lX-%08lX-%08lX Status %08lX\n",
+                                  "AFSLocateNameEntry (FO: %p) Failed to evaluate possible DFS Link %wZ FID %08lX-%08lX-%08lX-%08lX Status %08lX\n",
                                   FileObject,
                                   &pDirEntry->NameInformation.FileName,
                                   pCurrentObject->FileId.Cell,
                                   pCurrentObject->FileId.Volume,
                                   pCurrentObject->FileId.Vnode,
                                   pCurrentObject->FileId.Unique,
-                                  ntStatus);
+                                  ntStatus));
 
                     try_return( ntStatus);
                 }
@@ -1874,15 +2224,15 @@ AFSLocateNameEntry( IN GUID *AuthGroup,
             // Update the name array
             //
 
-            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+            AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                           AFS_TRACE_LEVEL_VERBOSE,
-                          "AFSLocateNameEntry (FO: %08lX) Inserting name array entry %wZ FID %08lX-%08lX-%08lX-%08lX\n",
+                          "AFSLocateNameEntry (FO: %p) Inserting name array entry %wZ FID %08lX-%08lX-%08lX-%08lX\n",
                           FileObject,
                           &pDirEntry->NameInformation.FileName,
                           pCurrentObject->FileId.Cell,
                           pCurrentObject->FileId.Volume,
                           pCurrentObject->FileId.Vnode,
-                          pCurrentObject->FileId.Unique);
+                          pCurrentObject->FileId.Unique));
 
             ntStatus = AFSInsertNextElement( pNameArray,
                                              pDirEntry);
@@ -1896,91 +2246,99 @@ AFSLocateNameEntry( IN GUID *AuthGroup,
 
 try_exit:
 
-        AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+        AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                       AFS_TRACE_LEVEL_VERBOSE,
-                      "AFSLocateNameEntry (FO: %08lX) Completed processing %wZ Status %08lX\n",
+                      "AFSLocateNameEntry (FO: %p) Completed processing %wZ Status %08lX\n",
                       FileObject,
                       RootPathName,
-                      ntStatus);
+                      ntStatus));
 
         if( ( !NT_SUCCESS( ntStatus) &&
               ntStatus != STATUS_OBJECT_NAME_NOT_FOUND) ||
             ntStatus == STATUS_REPARSE)
         {
-
-            if( pDirEntry != NULL)
+            if( RootPathName->Buffer != uniFullPathName.Buffer)
             {
 
-                lCount = InterlockedDecrement( &pDirEntry->OpenReferenceCount);
+                AFSExFreePoolWithTag( uniFullPathName.Buffer, 0);
+            }
+        }
+        else
+        {
+
+            if( *OutParentDirectoryCB != NULL)
+            {
 
-                AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
+                AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
                               AFS_TRACE_LEVEL_VERBOSE,
-                              "AFSLocateNameEntry Decrement6 count on %wZ DE %p Ccb %p Cnt %d\n",
-                              &pDirEntry->NameInformation.FileName,
-                              pDirEntry,
+                              "AFSLocateNameEntry Count on Parent %wZ DE %p Ccb %p Cnt %d\n",
+                              &(*OutParentDirectoryCB)->NameInformation.FileName,
+                              *OutParentDirectoryCB,
                               NULL,
-                              lCount);
+                              (*OutParentDirectoryCB)->DirOpenReferenceCount));
             }
-            else if( pParentDirEntry != NULL)
-            {
 
-                lCount = InterlockedDecrement( &pParentDirEntry->OpenReferenceCount);
+            if( *OutDirectoryCB != NULL)
+            {
 
-                AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
+                AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
                               AFS_TRACE_LEVEL_VERBOSE,
-                              "AFSLocateNameEntry Decrement7 count on %wZ DE %p Ccb %p Cnt %d\n",
-                              &pParentDirEntry->NameInformation.FileName,
-                              pParentDirEntry,
+                              "AFSLocateNameEntry Count on %wZ DE %p Ccb %p Cnt %d\n",
+                              &(*OutDirectoryCB)->NameInformation.FileName,
+                              *OutDirectoryCB,
                               NULL,
-                              lCount);
+                              (*OutDirectoryCB)->DirOpenReferenceCount));
             }
+        }
 
-            if( bReleaseCurrentVolume)
-            {
+        if( pDirEntry != NULL)
+        {
 
-                ASSERT( pCurrentVolume->VolumeReferenceCount > 1);
+            lCount = InterlockedDecrement( &pDirEntry->DirOpenReferenceCount);
 
-                lCount = InterlockedDecrement( &pCurrentVolume->VolumeReferenceCount);
+            AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
+                          AFS_TRACE_LEVEL_VERBOSE,
+                          "AFSLocateNameEntry Decrement6 count on %wZ DE %p Ccb %p Cnt %d\n",
+                          &pDirEntry->NameInformation.FileName,
+                          pDirEntry,
+                          NULL,
+                          lCount));
 
-                AFSDbgLogMsg( AFS_SUBSYSTEM_VOLUME_REF_COUNTING,
-                              AFS_TRACE_LEVEL_VERBOSE,
-                              "AFSLocateNameEntry Decrement3 count on volume %08lX Cnt %d\n",
-                              pCurrentVolume,
-                              lCount);
-            }
+            ASSERT( lCount >= 0);
+        }
 
-            if( RootPathName->Buffer != uniFullPathName.Buffer)
-            {
+        if( pParentDirEntry != NULL)
+        {
 
-                AFSExFreePoolWithTag( uniFullPathName.Buffer, 0);
-            }
+            lCount = InterlockedDecrement( &pParentDirEntry->DirOpenReferenceCount);
+
+            AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
+                          AFS_TRACE_LEVEL_VERBOSE,
+                          "AFSLocateNameEntry Decrement7 count on %wZ DE %p Ccb %p Cnt %d\n",
+                          &pParentDirEntry->NameInformation.FileName,
+                          pParentDirEntry,
+                          NULL,
+                          lCount));
+
+            ASSERT( lCount >= 0);
         }
-        else
+
+        if( bReleaseCurrentVolume)
         {
 
-            if( *ParentDirectoryCB != NULL)
-            {
+            ASSERT( pCurrentVolume->VolumeReferenceCount > 0);
 
-                AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
-                              AFS_TRACE_LEVEL_VERBOSE,
-                              "AFSLocateNameEntry Count on Parent %wZ DE %p Ccb %p Cnt %d\n",
-                              &(*ParentDirectoryCB)->NameInformation.FileName,
-                              *ParentDirectoryCB,
-                              NULL,
-                              (*ParentDirectoryCB)->OpenReferenceCount);
-            }
+            lCount = AFSVolumeDecrement( pCurrentVolume,
+                                         VolumeReferenceReason);
 
-            if( *DirectoryCB != NULL)
-            {
+            AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING,
+                          AFS_TRACE_LEVEL_VERBOSE,
+                          "AFSLocateNameEntry Decrement7 count on volume %p Reason %u Cnt %d\n",
+                          pCurrentVolume,
+                          VolumeReferenceReason,
+                          lCount));
 
-                AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
-                              AFS_TRACE_LEVEL_VERBOSE,
-                              "AFSLocateNameEntry Count on %wZ DE %p Ccb %p Cnt %d\n",
-                              &(*DirectoryCB)->NameInformation.FileName,
-                              *DirectoryCB,
-                              NULL,
-                              (*DirectoryCB)->OpenReferenceCount);
-            }
+            bReleaseCurrentVolume = FALSE;
         }
 
         if( bSubstituteName &&
@@ -2004,16 +2362,16 @@ AFSCreateDirEntry( IN GUID            *AuthGroup,
                    IN OUT AFSDirectoryCB **DirEntry)
 {
 
+    UNREFERENCED_PARAMETER(FileName);
     NTSTATUS ntStatus = STATUS_SUCCESS;
     AFSDirectoryCB *pDirNode = NULL, *pExistingDirNode = NULL;
-    UNICODE_STRING uniShortName;
     LARGE_INTEGER liFileSize = {0,0};
     LONG lCount;
 
     __Enter
     {
 
-        AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+        AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                       AFS_TRACE_LEVEL_VERBOSE_2,
                       "AFSCreateDirEntry Creating dir entry in parent %wZ FID %08lX-%08lX-%08lX-%08lX Component %wZ Attribs %08lX\n",
                       &ParentDirCB->NameInformation.FileName,
@@ -2022,7 +2380,7 @@ AFSCreateDirEntry( IN GUID            *AuthGroup,
                       ParentObjectInfo->FileId.Vnode,
                       ParentObjectInfo->FileId.Unique,
                       ComponentName,
-                      Attributes);
+                      Attributes));
 
         //
         // OK, before inserting the node into the parent tree, issue
@@ -2053,7 +2411,7 @@ AFSCreateDirEntry( IN GUID            *AuthGroup,
         if( !NT_SUCCESS( ntStatus))
         {
 
-            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+            AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                           AFS_TRACE_LEVEL_ERROR,
                           "AFSCreateDirEntry Failed to create dir entry in parent %wZ FID %08lX-%08lX-%08lX-%08lX Component %wZ Attribs %08lX Status %08lX\n",
                           &ParentDirCB->NameInformation.FileName,
@@ -2063,11 +2421,16 @@ AFSCreateDirEntry( IN GUID            *AuthGroup,
                           ParentObjectInfo->FileId.Unique,
                           ComponentName,
                           Attributes,
-                          ntStatus);
+                          ntStatus));
 
             try_return( ntStatus);
         }
 
+        //
+        // If AFSNotifyFileCreate returns pDirNode != NULL, then its
+        // DirOpenReferenceCount is held.
+        //
+
         AFSAcquireExcl( ParentObjectInfo->Specific.Directory.DirectoryNodeHdr.TreeLock,
                         TRUE);
 
@@ -2078,14 +2441,14 @@ AFSCreateDirEntry( IN GUID            *AuthGroup,
         if( BooleanFlagOn( ParentObjectInfo->Flags, AFS_OBJECT_FLAGS_VERIFY))
         {
 
-            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+            AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                           AFS_TRACE_LEVEL_VERBOSE,
                           "AFSCreateDirEntry Verifying parent %wZ FID %08lX-%08lX-%08lX-%08lX\n",
                           &ParentDirCB->NameInformation.FileName,
                           ParentObjectInfo->FileId.Cell,
                           ParentObjectInfo->FileId.Volume,
                           ParentObjectInfo->FileId.Vnode,
-                          ParentObjectInfo->FileId.Unique);
+                          ParentObjectInfo->FileId.Unique));
 
             ntStatus = AFSVerifyEntry( AuthGroup,
                                        ParentDirCB);
@@ -2093,7 +2456,7 @@ AFSCreateDirEntry( IN GUID            *AuthGroup,
             if( !NT_SUCCESS( ntStatus))
             {
 
-                AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                               AFS_TRACE_LEVEL_ERROR,
                               "AFSCreateDirEntry Failed to verify parent %wZ FID %08lX-%08lX-%08lX-%08lX Status %08lX\n",
                               &ParentDirCB->NameInformation.FileName,
@@ -2101,7 +2464,7 @@ AFSCreateDirEntry( IN GUID            *AuthGroup,
                               ParentObjectInfo->FileId.Volume,
                               ParentObjectInfo->FileId.Vnode,
                               ParentObjectInfo->FileId.Unique,
-                              ntStatus);
+                              ntStatus));
 
                 AFSReleaseResource( ParentObjectInfo->Specific.Directory.DirectoryNodeHdr.TreeLock);
 
@@ -2123,19 +2486,32 @@ AFSCreateDirEntry( IN GUID            *AuthGroup,
                                &pExistingDirNode->ObjectInformation->FileId))
             {
 
-                AFSDeleteDirEntry( ParentObjectInfo,
-                                   pDirNode);
+                if ( pExistingDirNode != pDirNode)
+                {
 
-                lCount = InterlockedIncrement( &pExistingDirNode->OpenReferenceCount);
+                    lCount = InterlockedDecrement( &pDirNode->DirOpenReferenceCount);
 
-                AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
-                              AFS_TRACE_LEVEL_VERBOSE,
-                              "AFSCreateDirEntry Increment count on %wZ DE %p Cnt %d\n",
-                              &pExistingDirNode->NameInformation.FileName,
-                              pExistingDirNode,
-                              lCount);
+                    AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
+                                  AFS_TRACE_LEVEL_VERBOSE,
+                                  "AFSCreateDirEntry Decrement count on %wZ DE %p Cnt %d\n",
+                                  &pDirNode->NameInformation.FileName,
+                                  pDirNode,
+                                  lCount));
 
-                *DirEntry = pExistingDirNode;
+                    AFSDeleteDirEntry( ParentObjectInfo,
+                                       &pDirNode);
+
+                    lCount = InterlockedIncrement( &pExistingDirNode->DirOpenReferenceCount);
+
+                    AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
+                                  AFS_TRACE_LEVEL_VERBOSE,
+                                  "AFSCreateDirEntry Increment count on %wZ DE %p Cnt %d\n",
+                                  &pExistingDirNode->NameInformation.FileName,
+                                  pExistingDirNode,
+                                  lCount));
+
+                    *DirEntry = pExistingDirNode;
+                }
 
                 AFSReleaseResource( ParentObjectInfo->Specific.Directory.DirectoryNodeHdr.TreeLock);
 
@@ -2148,10 +2524,11 @@ AFSCreateDirEntry( IN GUID            *AuthGroup,
                 // Need to tear down this entry and rebuild it below
                 //
 
-                if( pExistingDirNode->OpenReferenceCount == 0)
+                if( pExistingDirNode->DirOpenReferenceCount <= 0 &&
+                    pExistingDirNode->NameArrayReferenceCount <= 0)
                 {
 
-                    AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                    AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                   AFS_TRACE_LEVEL_VERBOSE,
                                   "AFSCreateDirEntry Different FIDs - Deleting DE %p for %wZ Old FID %08lX-%08lX-%08lX-%08lX New FID %08lX-%08lX-%08lX-%08lX\n",
                                   pExistingDirNode,
@@ -2163,17 +2540,17 @@ AFSCreateDirEntry( IN GUID            *AuthGroup,
                                   pDirNode->ObjectInformation->FileId.Cell,
                                   pDirNode->ObjectInformation->FileId.Volume,
                                   pDirNode->ObjectInformation->FileId.Vnode,
-                                  pDirNode->ObjectInformation->FileId.Unique);
+                                  pDirNode->ObjectInformation->FileId.Unique));
 
                     AFSDeleteDirEntry( ParentObjectInfo,
-                                       pExistingDirNode);
+                                       &pExistingDirNode);
                 }
                 else
                 {
 
                     SetFlag( pExistingDirNode->Flags, AFS_DIR_ENTRY_DELETED);
 
-                    AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                    AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                   AFS_TRACE_LEVEL_VERBOSE,
                                   "AFSCreateDirEntry Different FIDs - Removing DE %p for %wZ Old FID %08lX-%08lX-%08lX-%08lX New FID %08lX-%08lX-%08lX-%08lX\n",
                                   pExistingDirNode,
@@ -2185,16 +2562,15 @@ AFSCreateDirEntry( IN GUID            *AuthGroup,
                                   pDirNode->ObjectInformation->FileId.Cell,
                                   pDirNode->ObjectInformation->FileId.Volume,
                                   pDirNode->ObjectInformation->FileId.Vnode,
-                                  pDirNode->ObjectInformation->FileId.Unique);
+                                  pDirNode->ObjectInformation->FileId.Unique));
 
                     AFSRemoveNameEntry( ParentObjectInfo,
                                         pExistingDirNode);
                 }
-
             }
         }
 
-        AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+        AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                       AFS_TRACE_LEVEL_VERBOSE_2,
                       "AFSCreateDirEntry Inserting dir entry in parent %wZ FID %08lX-%08lX-%08lX-%08lX Component %wZ\n",
                       &ParentDirCB->NameInformation.FileName,
@@ -2202,7 +2578,7 @@ AFSCreateDirEntry( IN GUID            *AuthGroup,
                       ParentObjectInfo->FileId.Volume,
                       ParentObjectInfo->FileId.Vnode,
                       ParentObjectInfo->FileId.Unique,
-                      ComponentName);
+                      ComponentName));
 
         //
         // Insert the directory node
@@ -2212,15 +2588,6 @@ AFSCreateDirEntry( IN GUID            *AuthGroup,
                                 pDirNode,
                                 TRUE);
 
-        lCount = InterlockedIncrement( &pDirNode->OpenReferenceCount);
-
-        AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
-                      AFS_TRACE_LEVEL_VERBOSE,
-                      "AFSCreateDirEntry Increment2 count on %wZ DE %p Cnt %d\n",
-                      &pDirNode->NameInformation.FileName,
-                      pDirNode,
-                      lCount);
-
         //
         // Pass back the dir entry
         //
@@ -2254,11 +2621,11 @@ AFSInsertDirectoryNode( IN AFSObjectInfoCB *ParentObjectInfo,
         // Insert the node into the directory node tree
         //
 
-        AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+        AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                       AFS_TRACE_LEVEL_VERBOSE,
                       "AFSInsertDirectoryNode Insert DE %p for %wZ Clearing NOT_IN flag\n",
                       DirEntry,
-                      &DirEntry->NameInformation.FileName);
+                      &DirEntry->NameInformation.FileName));
 
         ClearFlag( DirEntry->Flags, AFS_DIR_ENTRY_NOT_IN_PARENT_TREE);
 
@@ -2267,11 +2634,11 @@ AFSInsertDirectoryNode( IN AFSObjectInfoCB *ParentObjectInfo,
 
             ParentObjectInfo->Specific.Directory.DirectoryNodeHdr.CaseSensitiveTreeHead = DirEntry;
 
-            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+            AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                           AFS_TRACE_LEVEL_VERBOSE,
                           "AFSInsertDirectoryNode Insert DE %p to head of case sensitive tree for %wZ\n",
                           DirEntry,
-                          &DirEntry->NameInformation.FileName);
+                          &DirEntry->NameInformation.FileName));
         }
         else
         {
@@ -2279,11 +2646,11 @@ AFSInsertDirectoryNode( IN AFSObjectInfoCB *ParentObjectInfo,
             AFSInsertCaseSensitiveDirEntry( ParentObjectInfo->Specific.Directory.DirectoryNodeHdr.CaseSensitiveTreeHead,
                                             DirEntry);
 
-            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+            AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                           AFS_TRACE_LEVEL_VERBOSE,
                           "AFSInsertDirectoryNode Insert DE %p to case sensitive tree for %wZ\n",
                           DirEntry,
-                          &DirEntry->NameInformation.FileName);
+                          &DirEntry->NameInformation.FileName));
         }
 
         if( ParentObjectInfo->Specific.Directory.DirectoryNodeHdr.CaseInsensitiveTreeHead == NULL)
@@ -2293,11 +2660,11 @@ AFSInsertDirectoryNode( IN AFSObjectInfoCB *ParentObjectInfo,
 
             SetFlag( DirEntry->Flags, AFS_DIR_ENTRY_CASE_INSENSTIVE_LIST_HEAD);
 
-            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+            AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                           AFS_TRACE_LEVEL_VERBOSE,
                           "AFSInsertDirectoryNode Insert DE %p to head of case insensitive tree for %wZ\n",
                           DirEntry,
-                          &DirEntry->NameInformation.FileName);
+                          &DirEntry->NameInformation.FileName));
         }
         else
         {
@@ -2305,11 +2672,11 @@ AFSInsertDirectoryNode( IN AFSObjectInfoCB *ParentObjectInfo,
             AFSInsertCaseInsensitiveDirEntry( ParentObjectInfo->Specific.Directory.DirectoryNodeHdr.CaseInsensitiveTreeHead,
                                               DirEntry);
 
-            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+            AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                           AFS_TRACE_LEVEL_VERBOSE,
                           "AFSInsertDirectoryNode Insert DE %p to case insensitive tree for %wZ\n",
                           DirEntry,
-                          &DirEntry->NameInformation.FileName);
+                          &DirEntry->NameInformation.FileName));
         }
 
         //
@@ -2324,11 +2691,11 @@ AFSInsertDirectoryNode( IN AFSObjectInfoCB *ParentObjectInfo,
 
                 ParentObjectInfo->Specific.Directory.ShortNameTree = DirEntry;
 
-                AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                               AFS_TRACE_LEVEL_VERBOSE,
                               "AFSInsertDirectoryNode Insert DE %p to head of shortname tree for %wZ\n",
                               DirEntry,
-                              &DirEntry->NameInformation.FileName);
+                              &DirEntry->NameInformation.FileName));
 
                 SetFlag( DirEntry->Flags, AFS_DIR_ENTRY_INSERTED_SHORT_NAME);
             }
@@ -2338,21 +2705,21 @@ AFSInsertDirectoryNode( IN AFSObjectInfoCB *ParentObjectInfo,
                 if( !NT_SUCCESS( AFSInsertShortNameDirEntry( ParentObjectInfo->Specific.Directory.ShortNameTree,
                                                              DirEntry)))
                 {
-                    AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                    AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                   AFS_TRACE_LEVEL_VERBOSE,
                                   "AFSInsertDirectoryNode Failed to insert DE %p to shortname tree for %wZ\n",
                                   DirEntry,
-                                  &DirEntry->NameInformation.FileName);
+                                  &DirEntry->NameInformation.FileName));
                 }
                 else
                 {
                     SetFlag( DirEntry->Flags, AFS_DIR_ENTRY_INSERTED_SHORT_NAME);
 
-                    AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                    AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                   AFS_TRACE_LEVEL_VERBOSE,
                                   "AFSInsertDirectoryNode Insert DE %p to shortname tree for %wZ\n",
                                   DirEntry,
-                                  &DirEntry->NameInformation.FileName);
+                                  &DirEntry->NameInformation.FileName));
                 }
             }
         }
@@ -2364,15 +2731,15 @@ AFSInsertDirectoryNode( IN AFSObjectInfoCB *ParentObjectInfo,
             // And insert the node into the directory list
             //
 
-            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+            AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                           AFS_TRACE_LEVEL_VERBOSE,
-                          "AFSInsertDirectoryNode Inserting entry %08lX %wZ FID %08lX-%08lX-%08lX-%08lX\n",
+                          "AFSInsertDirectoryNode Inserting entry %p %wZ FID %08lX-%08lX-%08lX-%08lX\n",
                           DirEntry,
                           &DirEntry->NameInformation.FileName,
                           DirEntry->ObjectInformation->FileId.Cell,
                           DirEntry->ObjectInformation->FileId.Volume,
                           DirEntry->ObjectInformation->FileId.Vnode,
-                          DirEntry->ObjectInformation->FileId.Unique);
+                          DirEntry->ObjectInformation->FileId.Unique));
 
             if( ParentObjectInfo->Specific.Directory.DirectoryNodeListHead == NULL)
             {
@@ -2393,7 +2760,7 @@ AFSInsertDirectoryNode( IN AFSObjectInfoCB *ParentObjectInfo,
 
             lCount = InterlockedIncrement( &ParentObjectInfo->Specific.Directory.DirectoryNodeCount);
 
-            AFSDbgLogMsg( AFS_SUBSYSTEM_DIR_NODE_COUNT,
+            AFSDbgTrace(( AFS_SUBSYSTEM_DIR_NODE_COUNT,
                           AFS_TRACE_LEVEL_VERBOSE,
                           "AFSInsertDirectoryNode Adding entry %wZ Inc Count %d to parent FID %08lX-%08lX-%08lX-%08lX\n",
                           &DirEntry->NameInformation.FileName,
@@ -2401,88 +2768,113 @@ AFSInsertDirectoryNode( IN AFSObjectInfoCB *ParentObjectInfo,
                           ParentObjectInfo->FileId.Cell,
                           ParentObjectInfo->FileId.Volume,
                           ParentObjectInfo->FileId.Vnode,
-                          ParentObjectInfo->FileId.Unique);
+                          ParentObjectInfo->FileId.Unique));
         }
     }
 
     return;
 }
 
-NTSTATUS
+void
 AFSDeleteDirEntry( IN AFSObjectInfoCB *ParentObjectInfo,
-                   IN AFSDirectoryCB *DirEntry)
+                   IN AFSDirectoryCB **ppDirEntry)
 {
 
-    NTSTATUS ntStatus = STATUS_SUCCESS;
     LONG lCount;
+    AFSDirectoryCB *pDirEntry;
 
     __Enter
     {
 
-        AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+        pDirEntry = (AFSDirectoryCB *) InterlockedCompareExchangePointer( (PVOID *)ppDirEntry,
+                                                                          NULL,
+                                                                          *ppDirEntry);
+
+        if ( pDirEntry == NULL)
+        {
+
+            try_return( NOTHING);
+        }
+
+        AFSDbgTrace(( AFS_SUBSYSTEM_CLEANUP_PROCESSING | AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
                       AFS_TRACE_LEVEL_VERBOSE,
-                      "AFSDeleteDirEntry Deleting dir entry in parent %08lX Entry %08lX %wZ FID %08lX-%08lX-%08lX-%08lX\n",
+                     "AFSDeleteDirEntry Deleting dir entry in parent %p Entry %p object %p %wZ RefCount %d\n",
                       ParentObjectInfo,
-                      DirEntry,
-                      &DirEntry->NameInformation.FileName,
-                      DirEntry->ObjectInformation->FileId.Cell,
-                      DirEntry->ObjectInformation->FileId.Volume,
-                      DirEntry->ObjectInformation->FileId.Vnode,
-                      DirEntry->ObjectInformation->FileId.Unique);
+                      pDirEntry,
+                      pDirEntry->ObjectInformation,
+                      &pDirEntry->NameInformation.FileName,
+                      pDirEntry->DirOpenReferenceCount));
+
+        ASSERT( pDirEntry->DirOpenReferenceCount == 0);
 
         AFSRemoveDirNodeFromParent( ParentObjectInfo,
-                                    DirEntry,
+                                    pDirEntry,
                                     TRUE);
 
         //
         // Free up the name buffer if it was reallocated
         //
 
-        if( BooleanFlagOn( DirEntry->Flags, AFS_DIR_RELEASE_NAME_BUFFER))
+        if( BooleanFlagOn( pDirEntry->Flags, AFS_DIR_RELEASE_NAME_BUFFER))
         {
 
-            AFSExFreePoolWithTag( DirEntry->NameInformation.FileName.Buffer, 0);
+            AFSExFreePoolWithTag( pDirEntry->NameInformation.FileName.Buffer, 0);
         }
 
-        if( BooleanFlagOn( DirEntry->Flags, AFS_DIR_RELEASE_TARGET_NAME_BUFFER))
+        if( BooleanFlagOn( pDirEntry->Flags, AFS_DIR_RELEASE_TARGET_NAME_BUFFER))
         {
 
-            AFSExFreePoolWithTag( DirEntry->NameInformation.TargetName.Buffer, 0);
+            AFSExFreePoolWithTag( pDirEntry->NameInformation.TargetName.Buffer, 0);
         }
 
-        //
-        // Dereference the object for this dir entry
-        //
+        if ( pDirEntry->ObjectInformation != NULL)
+        {
 
-        ASSERT( DirEntry->ObjectInformation->ObjectReferenceCount > 0);
+            if( BooleanFlagOn( pDirEntry->Flags, AFS_DIR_ENTRY_DELETED) &&
+                pDirEntry->ObjectInformation->Links == 0)
+            {
 
-        lCount = AFSObjectInfoDecrement( DirEntry->ObjectInformation);
+                SetFlag( pDirEntry->ObjectInformation->Flags, AFS_OBJECT_FLAGS_DELETED);
+            }
 
-        AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING,
-                      AFS_TRACE_LEVEL_VERBOSE,
-                      "AFSDeleteDirEntry Decrement count on object %08lX Cnt %d\n",
-                      DirEntry->ObjectInformation,
-                      lCount);
+            //
+            // Dereference the object for this dir entry
+            //
 
-        if( BooleanFlagOn( DirEntry->Flags, AFS_DIR_ENTRY_DELETED) &&
-            DirEntry->ObjectInformation->Links == 0)
-        {
+            AFSAcquireShared( pDirEntry->ObjectInformation->VolumeCB->ObjectInfoTree.TreeLock,
+                              TRUE);
 
-            SetFlag( DirEntry->ObjectInformation->Flags, AFS_OBJECT_FLAGS_DELETED);
+            lCount = AFSObjectInfoDecrement( pDirEntry->ObjectInformation,
+                                             AFS_OBJECT_REFERENCE_DIRENTRY);
+
+            AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING,
+                          AFS_TRACE_LEVEL_VERBOSE,
+                         "AFSDeleteDirEntry Decrement count on object %p Cnt %d\n",
+                          pDirEntry->ObjectInformation,
+                          lCount));
+
+            AFSReleaseResource( pDirEntry->ObjectInformation->VolumeCB->ObjectInfoTree.TreeLock);
         }
 
-        ExDeleteResourceLite( &DirEntry->NonPaged->Lock);
+        ExDeleteResourceLite( &pDirEntry->NonPaged->Lock);
 
-        AFSExFreePoolWithTag( DirEntry->NonPaged, AFS_DIR_ENTRY_NP_TAG);
+        AFSExFreePoolWithTag( pDirEntry->NonPaged, AFS_DIR_ENTRY_NP_TAG);
 
         //
         // Free up the dir entry
         //
 
-        AFSExFreePoolWithTag( DirEntry, AFS_DIR_ENTRY_TAG);
-    }
+        AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_ALLOCATION,
+                      AFS_TRACE_LEVEL_VERBOSE,
+                     "AFSDeleteDirEntry AFS_DIR_ENTRY_TAG deallocating %p\n",
+                      pDirEntry));
 
-    return ntStatus;
+        AFSExFreePoolWithTag( pDirEntry, AFS_DIR_ENTRY_TAG);
+
+try_exit:
+
+        NOTHING;
+    }
 }
 
 NTSTATUS
@@ -2500,25 +2892,39 @@ AFSRemoveDirNodeFromParent( IN AFSObjectInfoCB *ParentObjectInfo,
 
         ASSERT( ExIsResourceAcquiredExclusiveLite( ParentObjectInfo->Specific.Directory.DirectoryNodeHdr.TreeLock));
 
-        AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
-                      AFS_TRACE_LEVEL_VERBOSE,
-                      "AFSRemoveDirNodeFromParent Removing DirEntry %08lX %wZ FID %08lX-%08lX-%08lX-%08lX from Parent %08lX\n",
-                      DirEntry,
-                      &DirEntry->NameInformation.FileName,
-                      DirEntry->ObjectInformation->FileId.Cell,
-                      DirEntry->ObjectInformation->FileId.Volume,
-                      DirEntry->ObjectInformation->FileId.Vnode,
-                      DirEntry->ObjectInformation->FileId.Unique,
-                      ParentObjectInfo);
+        if ( DirEntry->ObjectInformation != NULL)
+        {
+
+            AFSDbgTrace(( AFS_SUBSYSTEM_CLEANUP_PROCESSING,
+                          AFS_TRACE_LEVEL_VERBOSE,
+                          "AFSRemoveDirNodeFromParent Removing DirEntry %p %wZ FID %08lX-%08lX-%08lX-%08lX from Parent %p\n",
+                          DirEntry,
+                          &DirEntry->NameInformation.FileName,
+                          DirEntry->ObjectInformation->FileId.Cell,
+                          DirEntry->ObjectInformation->FileId.Volume,
+                          DirEntry->ObjectInformation->FileId.Vnode,
+                          DirEntry->ObjectInformation->FileId.Unique,
+                          ParentObjectInfo));
+        }
+        else
+        {
+
+            AFSDbgTrace(( AFS_SUBSYSTEM_CLEANUP_PROCESSING,
+                          AFS_TRACE_LEVEL_VERBOSE,
+                          "AFSRemoveDirNodeFromParent Removing DirEntry %p %wZ from Parent %p\n",
+                          DirEntry,
+                          &DirEntry->NameInformation.FileName,
+                          ParentObjectInfo));
+        }
 
         if( !BooleanFlagOn( DirEntry->Flags, AFS_DIR_ENTRY_NOT_IN_PARENT_TREE))
         {
 
-            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+            AFSDbgTrace(( AFS_SUBSYSTEM_CLEANUP_PROCESSING,
                           AFS_TRACE_LEVEL_VERBOSE,
-                          "AFSRemoveDirNodeFromParent Removing DirEntry %08lX name %wZ\n",
+                          "AFSRemoveDirNodeFromParent Removing DirEntry %p name %wZ\n",
                           DirEntry,
-                          &DirEntry->NameInformation.FileName);
+                          &DirEntry->NameInformation.FileName));
 
             AFSRemoveNameEntry( ParentObjectInfo,
                                 DirEntry);
@@ -2526,11 +2932,11 @@ AFSRemoveDirNodeFromParent( IN AFSObjectInfoCB *ParentObjectInfo,
         else
         {
 
-            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+            AFSDbgTrace(( AFS_SUBSYSTEM_CLEANUP_PROCESSING,
                           AFS_TRACE_LEVEL_VERBOSE,
                           "AFSRemoveDirNodeFromParent DE %p for %wZ NOT removing entry due to flag set\n",
                           DirEntry,
-                          &DirEntry->NameInformation.FileName);
+                          &DirEntry->NameInformation.FileName));
 
         }
 
@@ -2570,7 +2976,7 @@ AFSRemoveDirNodeFromParent( IN AFSObjectInfoCB *ParentObjectInfo,
 
             ClearFlag( DirEntry->Flags, AFS_DIR_ENTRY_INSERTED_ENUM_LIST);
 
-            AFSDbgLogMsg( AFS_SUBSYSTEM_DIR_NODE_COUNT,
+            AFSDbgTrace(( AFS_SUBSYSTEM_DIR_NODE_COUNT,
                           AFS_TRACE_LEVEL_VERBOSE,
                           "AFSRemoveDirNodeFromParent Removing entry %wZ Dec Count %d to parent FID %08lX-%08lX-%08lX-%08lX\n",
                           &DirEntry->NameInformation.FileName,
@@ -2578,7 +2984,7 @@ AFSRemoveDirNodeFromParent( IN AFSObjectInfoCB *ParentObjectInfo,
                           ParentObjectInfo->FileId.Cell,
                           ParentObjectInfo->FileId.Volume,
                           ParentObjectInfo->FileId.Vnode,
-                          ParentObjectInfo->FileId.Unique);
+                          ParentObjectInfo->FileId.Unique));
 
             DirEntry->ListEntry.fLink = NULL;
             DirEntry->ListEntry.bLink = NULL;
@@ -2683,7 +3089,7 @@ AFSParseName( IN PIRP Irp,
     AFSDeviceExt       *pDeviceExt = (AFSDeviceExt *)AFSRDRDeviceObject->DeviceExtension;
     UNICODE_STRING      uniFullName, uniComponentName, uniRemainingPath;
     ULONG               ulCRC = 0;
-    AFSDirectoryCB     *pDirEntry = NULL, *pShareDirEntry = NULL, *pTargetDirEntry = NULL;
+    AFSDirectoryCB     *pDirEntry = NULL;
     USHORT              usIndex = 0, usDriveIndex = 0;
     AFSCcb             *pRelatedCcb = NULL;
     AFSNameArrayHdr    *pNameArray = NULL, *pRelatedNameArray = NULL;
@@ -2704,6 +3110,8 @@ AFSParseName( IN PIRP Irp,
 
         *ParseFlags = AFS_PARSE_FLAG_ROOT_ACCESS;
 
+        *ParentDirectoryCB = NULL;
+
         if( pIrpSp->FileObject->RelatedFileObject != NULL)
         {
 
@@ -2721,25 +3129,25 @@ AFSParseName( IN PIRP Irp,
             // No wild cards in the name
             //
 
-            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+            AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                           AFS_TRACE_LEVEL_VERBOSE_2,
-                          "AFSParseName (%08lX) Relative open for %wZ FID %08lX-%08lX-%08lX-%08lX component %wZ\n",
+                          "AFSParseName (%p) Relative open for %wZ FID %08lX-%08lX-%08lX-%08lX component %wZ\n",
                           Irp,
                           &pRelatedCcb->DirectoryCB->NameInformation.FileName,
-                          pRelatedCcb->DirectoryCB->ObjectInformation->FileId.Cell,
-                          pRelatedCcb->DirectoryCB->ObjectInformation->FileId.Volume,
-                          pRelatedCcb->DirectoryCB->ObjectInformation->FileId.Vnode,
-                          pRelatedCcb->DirectoryCB->ObjectInformation->FileId.Unique,
-                          &uniFullName);
+                          pRelatedFcb->ObjectInformation->FileId.Cell,
+                          pRelatedFcb->ObjectInformation->FileId.Volume,
+                          pRelatedFcb->ObjectInformation->FileId.Vnode,
+                          pRelatedFcb->ObjectInformation->FileId.Unique,
+                          &uniFullName));
 
             if( FsRtlDoesNameContainWildCards( &uniFullName))
             {
 
-                AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                               AFS_TRACE_LEVEL_ERROR,
-                              "AFSParseName (%08lX) Component %wZ contains wild cards\n",
+                              "AFSParseName (%p) Component %wZ contains wild cards\n",
                               Irp,
-                              &uniFullName);
+                              &uniFullName));
 
                 try_return( ntStatus = STATUS_OBJECT_NAME_INVALID);
             }
@@ -2765,12 +3173,12 @@ AFSParseName( IN PIRP Irp,
                 // The volume has been taken off line so fail the access
                 //
 
-                AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                               AFS_TRACE_LEVEL_ERROR,
-                              "AFSParseName (%08lX) Volume %08lX:%08lX OFFLINE/INVALID\n",
+                              "AFSParseName (%p) Volume %08lX:%08lX OFFLINE/INVALID\n",
                               Irp,
                               pVolumeCB->ObjectInformation.FileId.Cell,
-                              pVolumeCB->ObjectInformation.FileId.Volume);
+                              pVolumeCB->ObjectInformation.FileId.Volume));
 
                 AFSReleaseResource( pVolumeCB->VolumeLock);
 
@@ -2780,12 +3188,12 @@ AFSParseName( IN PIRP Irp,
             if( BooleanFlagOn( pVolumeCB->ObjectInformation.Flags, AFS_OBJECT_FLAGS_VERIFY))
             {
 
-                AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                               AFS_TRACE_LEVEL_VERBOSE,
-                              "AFSParseName (%08lX) Verifying root of volume %08lX:%08lX\n",
+                              "AFSParseName (%p) Verifying root of volume %08lX:%08lX\n",
                               Irp,
                               pVolumeCB->ObjectInformation.FileId.Cell,
-                              pVolumeCB->ObjectInformation.FileId.Volume);
+                              pVolumeCB->ObjectInformation.FileId.Volume));
 
                 ntStatus = AFSVerifyVolume( (ULONGLONG)PsGetCurrentProcessId(),
                                             pVolumeCB);
@@ -2793,11 +3201,11 @@ AFSParseName( IN PIRP Irp,
                 if( !NT_SUCCESS( ntStatus))
                 {
 
-                    AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                    AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                   AFS_TRACE_LEVEL_ERROR,
-                                  "AFSParseName (%08lX) Failed verification of root Status %08lX\n",
+                                  "AFSParseName (%p) Failed verification of root Status %08lX\n",
                                   Irp,
-                                  ntStatus);
+                                  ntStatus));
 
                     AFSReleaseResource( pVolumeCB->VolumeLock);
 
@@ -2810,15 +3218,15 @@ AFSParseName( IN PIRP Irp,
             if( BooleanFlagOn( pDirEntry->ObjectInformation->Flags, AFS_OBJECT_FLAGS_VERIFY))
             {
 
-                AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                               AFS_TRACE_LEVEL_VERBOSE,
-                              "AFSParseName (%08lX) Verifying parent %wZ FID %08lX-%08lX-%08lX-%08lX\n",
+                              "AFSParseName (%p) Verifying parent %wZ FID %08lX-%08lX-%08lX-%08lX\n",
                               Irp,
                               &pDirEntry->NameInformation.FileName,
                               pDirEntry->ObjectInformation->FileId.Cell,
                               pDirEntry->ObjectInformation->FileId.Volume,
                               pDirEntry->ObjectInformation->FileId.Vnode,
-                              pDirEntry->ObjectInformation->FileId.Unique);
+                              pDirEntry->ObjectInformation->FileId.Unique));
 
                 //
                 // Directory TreeLock should be exclusively held
@@ -2835,16 +3243,16 @@ AFSParseName( IN PIRP Irp,
                 if( !NT_SUCCESS( ntStatus))
                 {
 
-                    AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                    AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                   AFS_TRACE_LEVEL_VERBOSE,
-                                  "AFSParseName (%08lX) Failed verification of parent %wZ FID %08lX-%08lX-%08lX-%08lX Status %08lX\n",
+                                  "AFSParseName (%p) Failed verification of parent %wZ FID %08lX-%08lX-%08lX-%08lX Status %08lX\n",
                                   Irp,
                                   &pDirEntry->NameInformation.FileName,
                                   pDirEntry->ObjectInformation->FileId.Cell,
                                   pDirEntry->ObjectInformation->FileId.Volume,
                                   pDirEntry->ObjectInformation->FileId.Vnode,
                                   pDirEntry->ObjectInformation->FileId.Unique,
-                                  ntStatus);
+                                  ntStatus));
 
                     try_return( ntStatus);
                 }
@@ -2868,10 +3276,10 @@ AFSParseName( IN PIRP Irp,
             if( uniFullName.Buffer == NULL)
             {
 
-                AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                               AFS_TRACE_LEVEL_ERROR,
-                              "AFSParseName (%08lX) Failed to allocate full name buffer\n",
-                              Irp);
+                              "AFSParseName (%p) Failed to allocate full name buffer\n",
+                              Irp));
 
                 try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES);
             }
@@ -2907,7 +3315,7 @@ AFSParseName( IN PIRP Irp,
 
                 RtlCopyMemory( &uniFullName.Buffer[ uniFullName.Length/sizeof( WCHAR)],
                                pIrpSp->FileObject->FileName.Buffer,
-                               pIr\epSp->FileObject->FileName.Length);
+                               pIrpSp->FileObject->FileName.Length);
 
                 uniFullName.Length += pIrpSp->FileObject->FileName.Length;
             }
@@ -2931,10 +3339,10 @@ AFSParseName( IN PIRP Irp,
                 if( pNameArray == NULL)
                 {
 
-                    AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                    AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                   AFS_TRACE_LEVEL_VERBOSE,
-                                  "AFSParseName (%08lX) Failed to initialize name array\n",
-                                  Irp);
+                                  "AFSParseName (%p) Failed to initialize name array\n",
+                                  Irp));
 
                     AFSExFreePoolWithTag( uniFullName.Buffer, 0);
 
@@ -2958,10 +3366,10 @@ AFSParseName( IN PIRP Irp,
                 if( pNameArray == NULL)
                 {
 
-                    AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                    AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                                   AFS_TRACE_LEVEL_VERBOSE,
-                                  "AFSParseName (%08lX) Failed to initialize name array\n",
-                                  Irp);
+                                  "AFSParseName (%p) Failed to initialize name array\n",
+                                  Irp));
 
                     AFSExFreePoolWithTag( uniFullName.Buffer, 0);
 
@@ -2976,10 +3384,10 @@ AFSParseName( IN PIRP Irp,
             if( !NT_SUCCESS( ntStatus))
             {
 
-                AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                               AFS_TRACE_LEVEL_VERBOSE,
-                              "AFSParseName (%08lX) Failed to populate name array\n",
-                              Irp);
+                              "AFSParseName (%p) Failed to populate name array\n",
+                              Irp));
 
                 AFSExFreePoolWithTag( uniFullName.Buffer, 0);
 
@@ -2999,37 +3407,28 @@ AFSParseName( IN PIRP Irp,
 
             *NameArray = pNameArray;
 
-            *VolumeCB = pVolumeCB;
-
             //
             // Increment our volume reference count
             //
 
-            lCount = InterlockedIncrement( &pVolumeCB->VolumeReferenceCount);
+            lCount = AFSVolumeIncrement( pVolumeCB,
+                                         AFS_VOLUME_REFERENCE_PARSE_NAME);
 
-            AFSDbgLogMsg( AFS_SUBSYSTEM_VOLUME_REF_COUNTING,
+            AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING,
                           AFS_TRACE_LEVEL_VERBOSE,
-                          "AFSParseName Increment count on volume %08lX Cnt %d\n",
+                          "AFSParseName Increment count on volume %p Cnt %d\n",
                           pVolumeCB,
-                          lCount);
-
-            *ParentDirectoryCB = pDirEntry;
+                          lCount));
 
-            lCount = InterlockedIncrement( &pDirEntry->OpenReferenceCount);
+            *VolumeCB = pVolumeCB;
 
-            AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
-                          AFS_TRACE_LEVEL_VERBOSE,
-                          "AFSParseName Increment1 count on %wZ DE %p Ccb %p Cnt %d\n",
-                          &pDirEntry->NameInformation.FileName,
-                          pDirEntry,
-                          NULL,
-                          lCount);
+            *ParentDirectoryCB = pDirEntry;
 
-            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+            AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                           AFS_TRACE_LEVEL_VERBOSE_2,
-                          "AFSParseName (%08lX) Returning full name %wZ\n",
+                          "AFSParseName (%p) Returning full name %wZ\n",
                           Irp,
-                          &uniFullName);
+                          &uniFullName));
 
             try_return( ntStatus);
         }
@@ -3044,11 +3443,11 @@ AFSParseName( IN PIRP Irp,
             uniFullName.Length < AFSServerName.Length)
         {
 
-            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+            AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                           AFS_TRACE_LEVEL_ERROR,
-                          "AFSParseName (%08lX) Name %wZ contains wild cards or too short\n",
+                          "AFSParseName (%p) Name %wZ contains wild cards or too short\n",
                           Irp,
-                          &uniFullName);
+                          &uniFullName));
 
             try_return( ntStatus = STATUS_OBJECT_NAME_INVALID);
         }
@@ -3117,11 +3516,11 @@ AFSParseName( IN PIRP Irp,
                                          TRUE) != 0)
             {
 
-                AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                               AFS_TRACE_LEVEL_ERROR,
-                              "AFSParseName (%08lX) Name %wZ does not have server name\n",
+                              "AFSParseName (%p) Name %wZ does not have server name\n",
                               Irp,
-                              &pIrpSp->FileObject->FileName);
+                              &pIrpSp->FileObject->FileName));
 
                 try_return( ntStatus = STATUS_BAD_NETWORK_NAME);
             }
@@ -3134,11 +3533,11 @@ AFSParseName( IN PIRP Irp,
                 !AFSIsDriveMapped( pIrpSp->FileObject->FileName.Buffer[ usDriveIndex]))
             {
 
-                AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                               AFS_TRACE_LEVEL_ERROR,
-                              "AFSParseName (%08lX) Name %wZ contains invalid drive mapping\n",
+                              "AFSParseName (%p) Name %wZ contains invalid drive mapping\n",
                               Irp,
-                              &pIrpSp->FileObject->FileName);
+                              &pIrpSp->FileObject->FileName));
 
                 try_return( ntStatus = STATUS_BAD_NETWORK_NAME);
             }
@@ -3147,20 +3546,20 @@ AFSParseName( IN PIRP Irp,
         if( FsRtlDoesNameContainWildCards( &uniFullName))
         {
 
-            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+            AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                           AFS_TRACE_LEVEL_ERROR,
-                          "AFSParseName (%08lX) Component %wZ contains wild cards\n",
+                          "AFSParseName (%p) Component %wZ contains wild cards\n",
                           Irp,
-                          &uniFullName);
+                          &uniFullName));
 
             try_return( ntStatus = STATUS_OBJECT_NAME_INVALID);
         }
 
-        AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+        AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                       AFS_TRACE_LEVEL_VERBOSE_2,
-                      "AFSParseName (%08lX) Processing full name %wZ\n",
+                      "AFSParseName (%p) Processing full name %wZ\n",
                       Irp,
-                      &uniFullName);
+                      &uniFullName));
 
         if( uniFullName.Length > 0 &&
             uniFullName.Buffer[ (uniFullName.Length/sizeof( WCHAR)) - 1] == L'\\')
@@ -3184,12 +3583,12 @@ AFSParseName( IN PIRP Irp,
             // The volume has been taken off line so fail the access
             //
 
-            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+            AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                           AFS_TRACE_LEVEL_ERROR,
-                          "AFSParseName (%08lX) Volume %08lX:%08lX OFFLINE/INVALID\n",
+                          "AFSParseName (%p) Volume %08lX:%08lX OFFLINE/INVALID\n",
                           Irp,
                           AFSGlobalRoot->ObjectInformation.FileId.Cell,
-                          AFSGlobalRoot->ObjectInformation.FileId.Volume);
+                          AFSGlobalRoot->ObjectInformation.FileId.Volume));
 
             AFSReleaseResource( AFSGlobalRoot->VolumeLock);
 
@@ -3199,12 +3598,12 @@ AFSParseName( IN PIRP Irp,
         if( BooleanFlagOn( AFSGlobalRoot->ObjectInformation.Flags, AFS_OBJECT_FLAGS_VERIFY))
         {
 
-            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+            AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                           AFS_TRACE_LEVEL_VERBOSE,
-                          "AFSParseName (%08lX) Verifying root of volume %08lX:%08lX\n",
+                          "AFSParseName (%p) Verifying root of volume %08lX:%08lX\n",
                           Irp,
                           AFSGlobalRoot->ObjectInformation.FileId.Cell,
-                          AFSGlobalRoot->ObjectInformation.FileId.Volume);
+                          AFSGlobalRoot->ObjectInformation.FileId.Volume));
 
             ntStatus = AFSVerifyVolume( (ULONGLONG)PsGetCurrentProcessId(),
                                         AFSGlobalRoot);
@@ -3212,11 +3611,11 @@ AFSParseName( IN PIRP Irp,
             if( !NT_SUCCESS( ntStatus))
             {
 
-                AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                               AFS_TRACE_LEVEL_ERROR,
-                              "AFSParseName (%08lX) Failed verification of root Status %08lX\n",
+                              "AFSParseName (%p) Failed verification of root Status %08lX\n",
                               Irp,
-                              ntStatus);
+                              ntStatus));
 
                 AFSReleaseResource( AFSGlobalRoot->VolumeLock);
 
@@ -3229,30 +3628,30 @@ AFSParseName( IN PIRP Irp,
         if( !BooleanFlagOn( AFSGlobalRoot->ObjectInformation.Flags, AFS_OBJECT_FLAGS_DIRECTORY_ENUMERATED))
         {
 
-            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+            AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                           AFS_TRACE_LEVEL_VERBOSE,
-                          "AFSParseName (%08lX) Enumerating global root of volume %08lX:%08lX\n",
+                          "AFSParseName (%p) Enumerating global root of volume %08lX:%08lX\n",
                           Irp,
                           AFSGlobalRoot->ObjectInformation.FileId.Cell,
-                          AFSGlobalRoot->ObjectInformation.FileId.Volume);
+                          AFSGlobalRoot->ObjectInformation.FileId.Volume));
 
             ntStatus = AFSEnumerateGlobalRoot( AuthGroup);
 
             if( !NT_SUCCESS( ntStatus))
             {
 
-                AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                               AFS_TRACE_LEVEL_ERROR,
-                              "AFSParseName (%08lX) Failed enumeraiton of root Status %08lX\n",
+                              "AFSParseName (%p) Failed enumeraiton of root Status %08lX\n",
                               Irp,
-                              ntStatus);
+                              ntStatus));
 
                 try_return( ntStatus);
             }
         }
 
         //
-        // Check for the \\Server access and return it as though it where \\Server\Globalroot
+        // Check for the \\Server access and return it as though it were \\Server\Globalroot
         //
 
         if( uniRemainingPath.Buffer == NULL ||
@@ -3260,20 +3659,20 @@ AFSParseName( IN PIRP Irp,
               uniRemainingPath.Buffer[ 0] == L'\\'))
         {
 
-            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+            AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                           AFS_TRACE_LEVEL_VERBOSE_2,
-                          "AFSParseName (%08lX) Returning global root access\n",
-                          Irp);
+                          "AFSParseName (%p) Returning global root access\n",
+                          Irp));
 
-            lCount = InterlockedIncrement( &AFSGlobalRoot->DirectoryCB->OpenReferenceCount);
+            lCount = InterlockedIncrement( &AFSGlobalRoot->DirectoryCB->DirOpenReferenceCount);
 
-            AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
+            AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
                           AFS_TRACE_LEVEL_VERBOSE,
                           "AFSParseName Increment2 count on %wZ DE %p Ccb %p Cnt %d\n",
                           &AFSGlobalRoot->DirectoryCB->NameInformation.FileName,
                           AFSGlobalRoot->DirectoryCB,
                           NULL,
-                          lCount);
+                          lCount));
 
             *VolumeCB = NULL;
 
@@ -3308,11 +3707,11 @@ AFSParseName( IN PIRP Irp,
         if( FsRtlDoesNameContainWildCards( &uniFullName))
         {
 
-            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+            AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                           AFS_TRACE_LEVEL_ERROR,
-                          "AFSParseName (%08lX) Component %wZ contains wild cards\n",
+                          "AFSParseName (%p) Component %wZ contains wild cards\n",
                           Irp,
-                          &uniComponentName);
+                          &uniComponentName));
 
             try_return( ntStatus = STATUS_OBJECT_NAME_INVALID);
         }
@@ -3339,20 +3738,20 @@ AFSParseName( IN PIRP Irp,
                   uniRemainingPath.Buffer[ 0] == L'\\'))
             {
 
-                AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                               AFS_TRACE_LEVEL_VERBOSE_2,
-                              "AFSParseName (%08lX) Returning global root access\n",
-                              Irp);
+                              "AFSParseName (%p) Returning global root access\n",
+                              Irp));
 
-                lCount = InterlockedIncrement( &AFSGlobalRoot->DirectoryCB->OpenReferenceCount);
+                lCount = InterlockedIncrement( &AFSGlobalRoot->DirectoryCB->DirOpenReferenceCount);
 
-                AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
+                AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
                               AFS_TRACE_LEVEL_VERBOSE,
                               "AFSParseName Increment3 count on %wZ DE %p Ccb %p Cnt %d\n",
                               &AFSGlobalRoot->DirectoryCB->NameInformation.FileName,
                               AFSGlobalRoot->DirectoryCB,
                               NULL,
-                              lCount);
+                              lCount));
 
                 *VolumeCB = NULL;
 
@@ -3382,20 +3781,20 @@ AFSParseName( IN PIRP Irp,
                                          TRUE) == 0)
             {
 
-                AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                               AFS_TRACE_LEVEL_VERBOSE_2,
-                              "AFSParseName (%08lX) Returning root PIOCtl access\n",
-                              Irp);
+                              "AFSParseName (%p) Returning root PIOCtl access\n",
+                              Irp));
 
-                lCount = InterlockedIncrement( &AFSGlobalRoot->DirectoryCB->OpenReferenceCount);
+                lCount = InterlockedIncrement( &AFSGlobalRoot->DirectoryCB->DirOpenReferenceCount);
 
-                AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
+                AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
                               AFS_TRACE_LEVEL_VERBOSE,
                               "AFSParseName Increment4 count on %wZ DE %p Ccb %p Cnt %d\n",
                               &AFSGlobalRoot->DirectoryCB->NameInformation.FileName,
                               AFSGlobalRoot->DirectoryCB,
                               NULL,
-                              lCount);
+                              lCount));
 
                 ClearFlag( *ParseFlags, AFS_PARSE_FLAG_ROOT_ACCESS);
 
@@ -3410,11 +3809,11 @@ AFSParseName( IN PIRP Irp,
                                                            &uniRemainingPath)) != NULL)
         {
 
-            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+            AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                           AFS_TRACE_LEVEL_VERBOSE_2,
-                          "AFSParseName (%08lX) Returning root share name %wZ access\n",
+                          "AFSParseName (%p) Returning root share name %wZ access\n",
                           Irp,
-                          &uniComponentName);
+                          &uniComponentName));
 
             //
             // Add in the full share name to pass back
@@ -3446,19 +3845,9 @@ AFSParseName( IN PIRP Irp,
 
             *FileName = uniComponentName;
 
-            *ParentDirectoryCB = pDirEntry;
-
             ClearFlag( *ParseFlags, AFS_PARSE_FLAG_ROOT_ACCESS);
 
-            lCount = InterlockedIncrement( &pDirEntry->OpenReferenceCount);
-
-            AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
-                          AFS_TRACE_LEVEL_VERBOSE,
-                          "AFSParseName Increment5 count on %wZ DE %p Ccb %p Cnt %d\n",
-                          &pDirEntry->NameInformation.FileName,
-                          pDirEntry,
-                          NULL,
-                          lCount);
+            *ParentDirectoryCB = pDirEntry;
 
             try_return( ntStatus = STATUS_SUCCESS);
         }
@@ -3531,6 +3920,13 @@ AFSParseName( IN PIRP Irp,
                              ntStatus == STATUS_OBJECT_PATH_NOT_FOUND)
                         {
 
+                            AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
+                                          AFS_TRACE_LEVEL_VERBOSE,
+                                          "AFSParseName (%p) AFSCheckCellName %wZ returned path not found; ntStatus %08X\n",
+                                          Irp,
+                                          &uniComponentName,
+                                          STATUS_OBJECT_NAME_NOT_FOUND));
+
                             ntStatus = STATUS_OBJECT_NAME_NOT_FOUND;
                         }
 
@@ -3570,10 +3966,10 @@ AFSParseName( IN PIRP Irp,
             if( pNameArray == NULL)
             {
 
-                AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                               AFS_TRACE_LEVEL_VERBOSE,
-                              "AFSParseName (%08lX) Failed to initialize name array\n",
-                              Irp);
+                              "AFSParseName (%p) Failed to initialize name array\n",
+                              Irp));
 
                 try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES);
             }
@@ -3584,10 +3980,10 @@ AFSParseName( IN PIRP Irp,
             if ( ntStatus)
             {
 
-                AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                               AFS_TRACE_LEVEL_VERBOSE,
-                              "AFSParseName (%08lX) Failed to insert name array element\n",
-                              Irp);
+                              "AFSParseName (%p) Failed to insert name array element\n",
+                              Irp));
 
                 try_return( ntStatus);
             }
@@ -3632,8 +4028,6 @@ AFSParseName( IN PIRP Irp,
                 //
                 // This is a root open so pass back no parent
                 //
-
-                *ParentDirectoryCB = NULL;
             }
         }
         else
@@ -3650,10 +4044,10 @@ AFSParseName( IN PIRP Irp,
             if( pNameArray == NULL)
             {
 
-                AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                               AFS_TRACE_LEVEL_VERBOSE,
-                              "AFSParseName (%08lX) Failed to initialize name array\n",
-                              Irp);
+                              "AFSParseName (%p) Failed to initialize name array\n",
+                              Irp));
 
                 try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES);
             }
@@ -3701,22 +4095,11 @@ AFSParseName( IN PIRP Irp,
             uniRemainingPath.Length += sizeof( WCHAR);
             uniRemainingPath.MaximumLength += sizeof( WCHAR);
 
-            lCount = InterlockedIncrement( &pVolumeCB->DirectoryCB->OpenReferenceCount);
-
-            AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
-                          AFS_TRACE_LEVEL_VERBOSE,
-                          "AFSParseName Increment6 count on %wZ DE %p Ccb %p Cnt %d\n",
-                          &pVolumeCB->DirectoryCB->NameInformation.FileName,
-                          pVolumeCB->DirectoryCB,
-                          NULL,
-                          lCount = pVolumeCB->DirectoryCB->OpenReferenceCount);
-
             //
             // Pass back the parent being the volume root
             //
 
             *ParentDirectoryCB = pVolumeCB->DirectoryCB;
-
         }
 
         //
@@ -3735,13 +4118,14 @@ AFSParseName( IN PIRP Irp,
         // Increment our reference on the volume
         //
 
-        lCount = InterlockedIncrement( &pVolumeCB->VolumeReferenceCount);
+        lCount = AFSVolumeIncrement( pVolumeCB,
+                                     AFS_VOLUME_REFERENCE_PARSE_NAME);
 
-        AFSDbgLogMsg( AFS_SUBSYSTEM_VOLUME_REF_COUNTING,
+        AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING,
                       AFS_TRACE_LEVEL_VERBOSE,
-                      "AFSParseName Increment2 count on global volume %08lX Cnt %d\n",
+                      "AFSParseName Increment2 count on global volume %p Cnt %d\n",
                       pVolumeCB,
-                      lCount);
+                      lCount));
 
 try_exit:
 
@@ -3751,19 +4135,21 @@ try_exit:
             if( *ParentDirectoryCB != NULL)
             {
 
-                AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
+                lCount = InterlockedIncrement( &(*ParentDirectoryCB)->DirOpenReferenceCount);
+
+                AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
                               AFS_TRACE_LEVEL_VERBOSE,
-                              "AFSParseName Count on %wZ DE %p Ccb %p Cnt %d\n",
+                              "AFSParseName Increment1 count on %wZ DE %p Ccb %p Cnt %d\n",
                               &(*ParentDirectoryCB)->NameInformation.FileName,
-                              *ParentDirectoryCB,
+                              (*ParentDirectoryCB),
                               NULL,
-                              (*ParentDirectoryCB)->OpenReferenceCount);
+                              lCount));
             }
         }
 
         if( *VolumeCB != NULL)
         {
-            ASSERT( (*VolumeCB)->VolumeReferenceCount > 1);
+            ASSERT( (*VolumeCB)->VolumeReferenceCount > 0);
         }
 
         if( ntStatus != STATUS_SUCCESS)
@@ -3789,7 +4175,6 @@ AFSCheckCellName( IN GUID *AuthGroup,
     NTSTATUS ntStatus = STATUS_SUCCESS;
     UNICODE_STRING uniName;
     AFSDirEnumEntry *pDirEnumEntry = NULL;
-    AFSDeviceExt *pDevExt = (AFSDeviceExt *)AFSRDRDeviceObject->DeviceExtension;
     AFSDirHdr *pDirHdr = &AFSGlobalRoot->ObjectInformation.Specific.Directory.DirectoryNodeHdr;
     AFSDirectoryCB *pDirNode = NULL;
     UNICODE_STRING uniDirName, uniTargetName;
@@ -3854,12 +4239,13 @@ AFSCheckCellName( IN GUID *AuthGroup,
         ntStatus = AFSEvaluateTargetByName( AuthGroup,
                                             &AFSGlobalRoot->ObjectInformation,
                                             CellName,
+                                            0,
                                             &pDirEnumEntry);
 
         if( !NT_SUCCESS( ntStatus))
         {
 
-            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+            AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                           AFS_TRACE_LEVEL_WARNING,
                           "AFSCheckCellName entry %wZ does not exist parent FID %08lX-%08lX-%08lX-%08lX Status %08lX\n",
                           CellName,
@@ -3867,7 +4253,7 @@ AFSCheckCellName( IN GUID *AuthGroup,
                           AFSGlobalRoot->ObjectInformation.FileId.Volume,
                           AFSGlobalRoot->ObjectInformation.FileId.Vnode,
                           AFSGlobalRoot->ObjectInformation.FileId.Unique,
-                          ntStatus);
+                          ntStatus));
 
             try_return( ntStatus);
         }
@@ -3898,6 +4284,10 @@ AFSCheckCellName( IN GUID *AuthGroup,
                                            &pDirEnumEntry->FileId,
                                            &pVolumeCB);
 
+            //
+            // On success returns with a volume reference count held
+            //
+
             if( !NT_SUCCESS( ntStatus))
             {
                 try_return( ntStatus);
@@ -3905,17 +4295,24 @@ AFSCheckCellName( IN GUID *AuthGroup,
 
             *ShareDirEntry = pVolumeCB->DirectoryCB;
 
-            lCount = InterlockedIncrement( &pVolumeCB->DirectoryCB->OpenReferenceCount);
+            lCount = InterlockedIncrement( &pVolumeCB->DirectoryCB->DirOpenReferenceCount);
 
-            AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
+            AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
                           AFS_TRACE_LEVEL_VERBOSE,
                           "AFSCheckCellName Increment1 count on %wZ DE %p Ccb %p Cnt %d\n",
                           &pVolumeCB->DirectoryCB->NameInformation.FileName,
                           pVolumeCB->DirectoryCB,
                           NULL,
-                          lCount);
+                          lCount));
 
-            lCount = InterlockedDecrement( &pVolumeCB->VolumeReferenceCount);
+            lCount = AFSVolumeDecrement( pVolumeCB,
+                                         AFS_VOLUME_REFERENCE_BUILD_ROOT);
+
+            AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING,
+                          AFS_TRACE_LEVEL_VERBOSE,
+                          "AFSCheckCellName Decrement count on volume %p Cnt %d\n",
+                          pVolumeCB,
+                          lCount));
         }
         else
         {
@@ -3970,7 +4367,7 @@ AFSCheckCellName( IN GUID *AuthGroup,
                 {
 
                     AFSDeleteDirEntry( &AFSGlobalRoot->ObjectInformation,
-                                       pDirNode);
+                                       &pDirNode);
 
                     AFSReleaseResource( AFSGlobalRoot->ObjectInformation.Specific.Directory.DirectoryNodeHdr.TreeLock);
 
@@ -4013,7 +4410,7 @@ AFSCheckCellName( IN GUID *AuthGroup,
 
             lCount = InterlockedIncrement( &AFSGlobalRoot->ObjectInformation.Specific.Directory.DirectoryNodeCount);
 
-            AFSDbgLogMsg( AFS_SUBSYSTEM_DIR_NODE_COUNT,
+            AFSDbgTrace(( AFS_SUBSYSTEM_DIR_NODE_COUNT,
                           AFS_TRACE_LEVEL_VERBOSE,
                           "AFSCheckCellName Adding entry %wZ Inc Count %d to parent FID %08lX-%08lX-%08lX-%08lX\n",
                           &pDirNode->NameInformation.FileName,
@@ -4021,17 +4418,17 @@ AFSCheckCellName( IN GUID *AuthGroup,
                           AFSGlobalRoot->ObjectInformation.FileId.Cell,
                           AFSGlobalRoot->ObjectInformation.FileId.Volume,
                           AFSGlobalRoot->ObjectInformation.FileId.Vnode,
-                          AFSGlobalRoot->ObjectInformation.FileId.Unique);
+                          AFSGlobalRoot->ObjectInformation.FileId.Unique));
 
-            lCount = InterlockedIncrement( &pDirNode->OpenReferenceCount);
+            lCount = InterlockedIncrement( &pDirNode->DirOpenReferenceCount);
 
-            AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
+            AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
                           AFS_TRACE_LEVEL_VERBOSE,
                           "AFSCheckCellName Increment2 count on %wZ DE %p Ccb %p Cnt %d\n",
                           &pDirNode->NameInformation.FileName,
                           pDirNode,
                           NULL,
-                          lCount);
+                          lCount));
 
             AFSReleaseResource( AFSGlobalRoot->ObjectInformation.Specific.Directory.DirectoryNodeHdr.TreeLock);
 
@@ -4063,8 +4460,6 @@ AFSBuildMountPointTarget( IN GUID *AuthGroup,
     NTSTATUS ntStatus = STATUS_SUCCESS;
     AFSDeviceExt *pDevExt = (AFSDeviceExt *) AFSRDRDeviceObject->DeviceExtension;
     AFSDirEnumEntry *pDirEntry = NULL;
-    AFSDirectoryCB *pDirNode = NULL;
-    UNICODE_STRING uniDirName, uniTargetName;
     ULONGLONG       ullIndex = 0;
     AFSVolumeCB *pVolumeCB = NULL;
     AFSFileID stTargetFileID;
@@ -4078,14 +4473,14 @@ AFSBuildMountPointTarget( IN GUID *AuthGroup,
         // Loop on each entry, building the chain until we encounter the final target
         //
 
-        AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+        AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                       AFS_TRACE_LEVEL_VERBOSE_2,
                       "AFSBuildMountPointTarget Building target directory for %wZ FID %08lX-%08lX-%08lX-%08lX\n",
                       &DirectoryCB->NameInformation.FileName,
                       DirectoryCB->ObjectInformation->FileId.Cell,
                       DirectoryCB->ObjectInformation->FileId.Volume,
                       DirectoryCB->ObjectInformation->FileId.Vnode,
-                      DirectoryCB->ObjectInformation->FileId.Unique);
+                      DirectoryCB->ObjectInformation->FileId.Unique));
 
         //
         // Do we need to evaluate the node?
@@ -4099,14 +4494,14 @@ AFSBuildMountPointTarget( IN GUID *AuthGroup,
             // Go evaluate the current target to get the target fid
             //
 
-            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+            AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                           AFS_TRACE_LEVEL_VERBOSE_2,
                           "AFSBuildMountPointTarget Evaluating target %wZ FID %08lX-%08lX-%08lX-%08lX\n",
                               &DirectoryCB->NameInformation.FileName,
                               DirectoryCB->ObjectInformation->FileId.Cell,
                               DirectoryCB->ObjectInformation->FileId.Volume,
                               DirectoryCB->ObjectInformation->FileId.Vnode,
-                              DirectoryCB->ObjectInformation->FileId.Unique);
+                              DirectoryCB->ObjectInformation->FileId.Unique));
 
             ntStatus = AFSEvaluateTargetByID( DirectoryCB->ObjectInformation,
                                               AuthGroup,
@@ -4116,11 +4511,12 @@ AFSBuildMountPointTarget( IN GUID *AuthGroup,
             if( !NT_SUCCESS( ntStatus))
             {
 
-                AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                               AFS_TRACE_LEVEL_ERROR,
                               "AFSBuildMountPointTarget Failed to evaluate target %wZ Status %08lX\n",
                               &DirectoryCB->NameInformation.FileName,
-                              ntStatus);
+                              ntStatus));
+
                 try_return( ntStatus);
             }
 
@@ -4128,14 +4524,14 @@ AFSBuildMountPointTarget( IN GUID *AuthGroup,
                 pDirEntry->TargetFileId.Unique == 0)
             {
 
-                AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                               AFS_TRACE_LEVEL_ERROR,
                               "AFSBuildMountPointTarget Target %wZ FID %08lX-%08lX-%08lX-%08lX service returned zero FID\n",
                               &DirectoryCB->NameInformation.FileName,
                               DirectoryCB->ObjectInformation->FileId.Cell,
                               DirectoryCB->ObjectInformation->FileId.Volume,
                               DirectoryCB->ObjectInformation->FileId.Vnode,
-                              DirectoryCB->ObjectInformation->FileId.Unique);
+                              DirectoryCB->ObjectInformation->FileId.Unique));
 
                 try_return( ntStatus = STATUS_REPARSE_POINT_NOT_RESOLVED);
             }
@@ -4170,19 +4566,19 @@ AFSBuildMountPointTarget( IN GUID *AuthGroup,
 
         ullIndex = AFSCreateHighIndex( &stTargetFileID);
 
-        AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING,
+        AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING,
                       AFS_TRACE_LEVEL_VERBOSE,
-                      "AFSBuildMountPointTarget Acquiring RDR VolumeTreeLock lock %08lX EXCL %08lX\n",
+                      "AFSBuildMountPointTarget Acquiring RDR VolumeTreeLock lock %p EXCL %08lX\n",
                       &pDevExt->Specific.RDR.VolumeTreeLock,
-                      PsGetCurrentThread());
+                      PsGetCurrentThread()));
 
         AFSAcquireShared( &pDevExt->Specific.RDR.VolumeTreeLock,
                           TRUE);
 
-        AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+        AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                       AFS_TRACE_LEVEL_VERBOSE_2,
                       "AFSBuildMountPointTarget Locating volume for target %I64X\n",
-                      ullIndex);
+                      ullIndex));
 
         ntStatus = AFSLocateHashEntry( pDevExt->Specific.RDR.VolumeTree.TreeHead,
                                        ullIndex,
@@ -4206,17 +4602,18 @@ AFSBuildMountPointTarget( IN GUID *AuthGroup,
             // Go init the root of the volume
             //
 
-            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+            AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                           AFS_TRACE_LEVEL_VERBOSE_2,
                           "AFSBuildMountPointTarget Initializing root for %wZ FID %08lX-%08lX-%08lX-%08lX\n",
                           &DirectoryCB->NameInformation.FileName,
                           DirectoryCB->ObjectInformation->FileId.Cell,
                           DirectoryCB->ObjectInformation->FileId.Volume,
                           DirectoryCB->ObjectInformation->FileId.Vnode,
-                          DirectoryCB->ObjectInformation->FileId.Unique);
+                          DirectoryCB->ObjectInformation->FileId.Unique));
 
             ntStatus = AFSInitVolume( AuthGroup,
                                       &stTargetFileID,
+                                      AFS_VOLUME_REFERENCE_MOUNTPT,
                                       &pVolumeCB);
 
             if( !NT_SUCCESS( ntStatus))
@@ -4241,13 +4638,14 @@ AFSBuildMountPointTarget( IN GUID *AuthGroup,
             // obtain one to match
             //
 
-            lCount = InterlockedIncrement( &pVolumeCB->VolumeReferenceCount);
+            lCount = AFSVolumeIncrement( pVolumeCB,
+                                         AFS_VOLUME_REFERENCE_MOUNTPT);
 
-            AFSDbgLogMsg( AFS_SUBSYSTEM_VOLUME_REF_COUNTING,
+            AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING,
                           AFS_TRACE_LEVEL_VERBOSE,
-                          "AFSBuildMountPointTarget Increment count on volume %08lX Cnt %d\n",
+                          "AFSBuildMountPointTarget Increment count on volume %p Cnt %d\n",
                           pVolumeCB,
-                          lCount);
+                          lCount));
 
             AFSReleaseResource( &pDevExt->Specific.RDR.VolumeTreeLock);
         }
@@ -4274,7 +4672,14 @@ AFSBuildMountPointTarget( IN GUID *AuthGroup,
             if( !NT_SUCCESS( ntStatus))
             {
 
-                lCount = InterlockedDecrement( &pVolumeCB->VolumeReferenceCount);
+                lCount = AFSVolumeDecrement( pVolumeCB,
+                                             AFS_VOLUME_REFERENCE_MOUNTPT);
+
+                AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING,
+                              AFS_TRACE_LEVEL_VERBOSE,
+                              "AFSBuildMountPoint Decrement count on volume %p Cnt %d\n",
+                              pVolumeCB,
+                              lCount));
 
                 AFSReleaseResource( pVolumeCB->VolumeLock);
 
@@ -4294,14 +4699,14 @@ AFSBuildMountPointTarget( IN GUID *AuthGroup,
             AFSReleaseResource( pVolumeCB->VolumeLock);
         }
 
-        AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+        AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                       AFS_TRACE_LEVEL_VERBOSE_2,
                       "AFSBuildMountPointTarget Evaluated target of %wZ FID %08lX-%08lX-%08lX-%08lX as root volume\n",
                       &pVolumeCB->DirectoryCB->NameInformation.FileName,
                       pVolumeCB->ObjectInformation.FileId.Cell,
                       pVolumeCB->ObjectInformation.FileId.Volume,
                       pVolumeCB->ObjectInformation.FileId.Vnode,
-                      pVolumeCB->ObjectInformation.FileId.Unique);
+                      pVolumeCB->ObjectInformation.FileId.Unique));
 
         *TargetVolumeCB = pVolumeCB;
 
@@ -4325,8 +4730,6 @@ AFSBuildRootVolume( IN GUID *AuthGroup,
 
     NTSTATUS ntStatus = STATUS_SUCCESS;
     AFSDeviceExt *pDevExt = (AFSDeviceExt *) AFSRDRDeviceObject->DeviceExtension;
-    AFSDirectoryCB *pDirNode = NULL;
-    UNICODE_STRING uniDirName, uniTargetName;
     ULONGLONG       ullIndex = 0;
     AFSVolumeCB *pVolumeCB = NULL;
     LONG lCount;
@@ -4335,29 +4738,29 @@ AFSBuildRootVolume( IN GUID *AuthGroup,
     __Enter
     {
 
-        AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+        AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                       AFS_TRACE_LEVEL_VERBOSE_2,
                       "AFSBuildRootVolume Building target volume for FID %08lX-%08lX-%08lX-%08lX\n",
                       FileId->Cell,
                       FileId->Volume,
                       FileId->Vnode,
-                      FileId->Unique);
+                      FileId->Unique));
 
         ullIndex = AFSCreateHighIndex( FileId);
 
-        AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING,
+        AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING,
                       AFS_TRACE_LEVEL_VERBOSE,
-                      "AFSBuildRootVolume Acquiring RDR VolumeTreeLock lock %08lX EXCL %08lX\n",
+                      "AFSBuildRootVolume Acquiring RDR VolumeTreeLock lock %p EXCL %08lX\n",
                       &pDevExt->Specific.RDR.VolumeTreeLock,
-                      PsGetCurrentThread());
+                      PsGetCurrentThread()));
 
         AFSAcquireShared( &pDevExt->Specific.RDR.VolumeTreeLock,
                           TRUE);
 
-        AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+        AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                       AFS_TRACE_LEVEL_VERBOSE_2,
                       "AFSBuildRootVolume Locating volume for target %I64X\n",
-                      ullIndex);
+                      ullIndex));
 
         ntStatus = AFSLocateHashEntry( pDevExt->Specific.RDR.VolumeTree.TreeHead,
                                        ullIndex,
@@ -4381,16 +4784,17 @@ AFSBuildRootVolume( IN GUID *AuthGroup,
             // Go init the root of the volume
             //
 
-            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
-                          AFS_TRACE_LEVEL_VERBOSE_2,
+            AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
+                         AFS_TRACE_LEVEL_VERBOSE_2,
                           "AFSBuildRootVolume Initializing root for FID %08lX-%08lX-%08lX-%08lX\n",
                           FileId->Cell,
                           FileId->Volume,
                           FileId->Vnode,
-                          FileId->Unique);
+                          FileId->Unique));
 
             ntStatus = AFSInitVolume( AuthGroup,
                                       FileId,
+                                      AFS_VOLUME_REFERENCE_BUILD_ROOT,
                                       &pVolumeCB);
 
             if( !NT_SUCCESS( ntStatus))
@@ -4415,13 +4819,14 @@ AFSBuildRootVolume( IN GUID *AuthGroup,
             // obtain one to match
             //
 
-            lCount = InterlockedIncrement( &pVolumeCB->VolumeReferenceCount);
+            lCount = AFSVolumeIncrement( pVolumeCB,
+                                         AFS_VOLUME_REFERENCE_BUILD_ROOT);
 
-            AFSDbgLogMsg( AFS_SUBSYSTEM_VOLUME_REF_COUNTING,
+            AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING,
                           AFS_TRACE_LEVEL_VERBOSE,
-                          "AFSBuildRootVolume Increment count on volume %08lX Cnt %d\n",
+                          "AFSBuildRootVolume Increment count on volume %p Cnt %d\n",
                           pVolumeCB,
-                          lCount);
+                          lCount));
 
             AFSReleaseResource( &pDevExt->Specific.RDR.VolumeTreeLock);
         }
@@ -4449,7 +4854,14 @@ AFSBuildRootVolume( IN GUID *AuthGroup,
             if( !NT_SUCCESS( ntStatus))
             {
 
-                lCount = InterlockedDecrement( &pVolumeCB->VolumeReferenceCount);
+                lCount = AFSVolumeDecrement( pVolumeCB,
+                                             AFS_VOLUME_REFERENCE_BUILD_ROOT);
+
+                AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING,
+                              AFS_TRACE_LEVEL_VERBOSE,
+                              "AFSBuildRootVolume Decrement count on volume %p Cnt %d\n",
+                              pVolumeCB,
+                              lCount));
 
                 AFSReleaseResource( pVolumeCB->VolumeLock);
 
@@ -4469,14 +4881,14 @@ AFSBuildRootVolume( IN GUID *AuthGroup,
             AFSReleaseResource( pVolumeCB->VolumeLock);
         }
 
-        AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+        AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                       AFS_TRACE_LEVEL_VERBOSE_2,
                       "AFSBuildRootVolume Evaluated target of %wZ FID %08lX-%08lX-%08lX-%08lX as root volume\n",
                       &pVolumeCB->DirectoryCB->NameInformation.FileName,
                       pVolumeCB->ObjectInformation.FileId.Cell,
                       pVolumeCB->ObjectInformation.FileId.Volume,
                       pVolumeCB->ObjectInformation.FileId.Vnode,
-                      pVolumeCB->ObjectInformation.FileId.Unique);
+                      pVolumeCB->ObjectInformation.FileId.Unique));
 
         *TargetVolumeCB = pVolumeCB;
 
@@ -4498,6 +4910,7 @@ AFSProcessDFSLink( IN AFSDirectoryCB *DirEntry,
     NTSTATUS ntStatus = STATUS_INVALID_DEVICE_REQUEST;
     UNICODE_STRING uniReparseName;
     UNICODE_STRING uniMUPDeviceName;
+    UNICODE_STRING uniIOMgrDeviceName;
     AFSDirEnumEntry *pDirEntry = NULL;
 
     __Enter
@@ -4510,6 +4923,9 @@ AFSProcessDFSLink( IN AFSDirectoryCB *DirEntry,
         RtlInitUnicodeString( &uniMUPDeviceName,
                               L"\\Device\\MUP");
 
+        RtlInitUnicodeString( &uniIOMgrDeviceName,
+                              L"\\??\\");
+
         uniReparseName.Length = 0;
         uniReparseName.Buffer = NULL;
 
@@ -4529,7 +4945,7 @@ AFSProcessDFSLink( IN AFSDirectoryCB *DirEntry,
                 pDirEntry->TargetNameLength == 0)
             {
 
-                AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                               AFS_TRACE_LEVEL_ERROR,
                               "AFSProcessDFSLink EvaluateTargetByID failed for Fcb %wZ FID %08lX-%08lX-%08lX-%08lX Status %08lX\n",
                               &DirEntry->NameInformation.FileName,
@@ -4537,7 +4953,7 @@ AFSProcessDFSLink( IN AFSDirectoryCB *DirEntry,
                               DirEntry->ObjectInformation->FileId.Volume,
                               DirEntry->ObjectInformation->FileId.Vnode,
                               DirEntry->ObjectInformation->FileId.Unique,
-                              ntStatus);
+                              ntStatus));
 
                 if( NT_SUCCESS( ntStatus))
                 {
@@ -4563,7 +4979,7 @@ AFSProcessDFSLink( IN AFSDirectoryCB *DirEntry,
             if( !NT_SUCCESS( ntStatus))
             {
 
-                AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+                AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                               AFS_TRACE_LEVEL_ERROR,
                               "AFSProcessDFSLink UpdateTargetName failed for Fcb %wZ FID %08lX-%08lX-%08lX-%08lX Status %08lX\n",
                               &DirEntry->NameInformation.FileName,
@@ -4571,7 +4987,7 @@ AFSProcessDFSLink( IN AFSDirectoryCB *DirEntry,
                               DirEntry->ObjectInformation->FileId.Volume,
                               DirEntry->ObjectInformation->FileId.Vnode,
                               DirEntry->ObjectInformation->FileId.Unique,
-                              ntStatus);
+                              ntStatus));
 
                 AFSReleaseResource( &DirEntry->NonPaged->Lock);
 
@@ -4609,7 +5025,7 @@ AFSProcessDFSLink( IN AFSDirectoryCB *DirEntry,
         if( uniReparseName.Buffer == NULL)
         {
 
-            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+            AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                           AFS_TRACE_LEVEL_ERROR,
                           "AFSProcessDFSLink uniReparseName.Buffer == NULL Fcb %wZ FID %08lX-%08lX-%08lX-%08lX Status %08lX\n",
                           &DirEntry->NameInformation.FileName,
@@ -4617,7 +5033,7 @@ AFSProcessDFSLink( IN AFSDirectoryCB *DirEntry,
                           DirEntry->ObjectInformation->FileId.Volume,
                           DirEntry->ObjectInformation->FileId.Vnode,
                           DirEntry->ObjectInformation->FileId.Unique,
-                          STATUS_INSUFFICIENT_RESOURCES);
+                          STATUS_INSUFFICIENT_RESOURCES));
 
             AFSReleaseResource( &DirEntry->NonPaged->Lock);
 
@@ -4628,18 +5044,32 @@ AFSProcessDFSLink( IN AFSDirectoryCB *DirEntry,
         // Start building the name
         //
 
-        RtlCopyMemory( uniReparseName.Buffer,
-                       uniMUPDeviceName.Buffer,
-                       uniMUPDeviceName.Length);
+        if ( DirEntry->NameInformation.TargetName.Buffer[ 0] != L'\\' &&
+             DirEntry->NameInformation.TargetName.Buffer[ 1] == L':')
+        {
 
-        uniReparseName.Length = uniMUPDeviceName.Length;
+            RtlCopyMemory( uniReparseName.Buffer,
+                           uniIOMgrDeviceName.Buffer,
+                           uniIOMgrDeviceName.Length);
 
-        if( DirEntry->NameInformation.TargetName.Buffer[ 0] != L'\\')
+            uniReparseName.Length = uniIOMgrDeviceName.Length;
+        }
+        else
         {
 
-            uniReparseName.Buffer[ uniReparseName.Length/sizeof( WCHAR)] = L'\\';
+            RtlCopyMemory( uniReparseName.Buffer,
+                           uniMUPDeviceName.Buffer,
+                           uniMUPDeviceName.Length);
+
+            uniReparseName.Length = uniMUPDeviceName.Length;
+
+            if( DirEntry->NameInformation.TargetName.Buffer[ 0] != L'\\')
+            {
+
+                uniReparseName.Buffer[ uniReparseName.Length/sizeof( WCHAR)] = L'\\';
 
-            uniReparseName.Length += sizeof( WCHAR);
+                uniReparseName.Length += sizeof( WCHAR);
+            }
         }
 
         RtlCopyMemory( &uniReparseName.Buffer[ uniReparseName.Length/sizeof( WCHAR)],
@@ -4682,7 +5112,7 @@ AFSProcessDFSLink( IN AFSDirectoryCB *DirEntry,
 
         FileObject->FileName = uniReparseName;
 
-        AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
+        AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING,
                       AFS_TRACE_LEVEL_VERBOSE,
                       "AFSProcessDFSLink Reparsing access to Fcb %wZ FID %08lX-%08lX-%08lX-%08lX to %wZ\n",
                       &DirEntry->NameInformation.FileName,
@@ -4690,7 +5120,7 @@ AFSProcessDFSLink( IN AFSDirectoryCB *DirEntry,
                       DirEntry->ObjectInformation->FileId.Volume,
                       DirEntry->ObjectInformation->FileId.Vnode,
                       DirEntry->ObjectInformation->FileId.Unique,
-                      &uniReparseName);
+                      &uniReparseName));
 
         //
         // Return status reparse ...