Windows: Name Array store mount point and volume root

Modify the Name Array processing to store both the mount point
object and the volume root directory object in the array.  This
is necessary for proper operation of
AFSPopulateNameArrayFromRelatedArray when the DirectoryCB parameter
is a mount point object.

Modify AFSBackupEntry to remove two entries if a volume root
directory entry is being removed.

Remove AFSReplaceCurrentElement() as it is no longer used.

Change-Id: Iaa0a4effc3448351d04bcdd72be9ee726ffe4e9a
Reviewed-on: http://gerrit.openafs.org/7021
Reviewed-by: Jeffrey Altman <jaltman@secure-endpoints.com>
Tested-by: Jeffrey Altman <jaltman@secure-endpoints.com>

diff --git a/src/WINNT/afsrdr/kernel/lib/AFSGeneric.cpp b/src/WINNT/afsrdr/kernel/lib/AFSGeneric.cpp
index 5179da0a2776924e482526aeb0f18f13931ccf9f..add53f1447a18dbcb083909573a99b6dac2e9c2f 100644 (file)
--- a/src/WINNT/afsrdr/kernel/lib/AFSGeneric.cpp
+++ b/src/WINNT/afsrdr/kernel/lib/AFSGeneric.cpp
@@ -5346,83 +5346,13 @@ try_exit:
     return ntStatus;
 }
 
-void
-AFSReplaceCurrentElement( IN AFSNameArrayHdr *NameArray,
-                          IN AFSDirectoryCB *DirectoryCB)
-{
-    AFSNameArrayCB *pCurrentElement = NULL;
-    LONG lCount;
-
-    AFSDbgLogMsg( AFS_SUBSYSTEM_NAME_ARRAY_PROCESSING,
-                  AFS_TRACE_LEVEL_VERBOSE,
-                  "AFSReplaceCurrentElement [NA:%p] passed DE %p FID %08lX-%08lX-%08lX-%08lX %wZ Type %d\n",
-                  NameArray,
-                  DirectoryCB,
-                  DirectoryCB->ObjectInformation->FileId.Cell,
-                  DirectoryCB->ObjectInformation->FileId.Volume,
-                  DirectoryCB->ObjectInformation->FileId.Vnode,
-                  DirectoryCB->ObjectInformation->FileId.Unique,
-                  &DirectoryCB->NameInformation.FileName,
-                  DirectoryCB->ObjectInformation->FileType);
-
-    ASSERT( NameArray->CurrentEntry != NULL);
-
-    pCurrentElement = NameArray->CurrentEntry;
-
-    AFSDbgLogMsg( AFS_SUBSYSTEM_NAME_ARRAY_PROCESSING,
-                  AFS_TRACE_LEVEL_VERBOSE,
-                  "AFSReplaceCurrentElement [NA:%p] Replacing Element[%d] DE %p FID %08lX-%08lX-%08lX-%08lX %wZ Type %d\n",
-                  NameArray,
-                  NameArray->Count - 1,
-                  pCurrentElement->DirectoryCB,
-                  pCurrentElement->FileId.Cell,
-                  pCurrentElement->FileId.Volume,
-                  pCurrentElement->FileId.Vnode,
-                  pCurrentElement->FileId.Unique,
-                  &pCurrentElement->DirectoryCB->NameInformation.FileName,
-                  pCurrentElement->DirectoryCB->ObjectInformation->FileType);
-
-    lCount = InterlockedDecrement( &NameArray->CurrentEntry->DirectoryCB->OpenReferenceCount);
-
-    AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
-                  AFS_TRACE_LEVEL_VERBOSE,
-                  "AFSReplaceCurrentElement Decrement count on %wZ DE %p Cnt %d\n",
-                  &pCurrentElement->DirectoryCB->NameInformation.FileName,
-                  pCurrentElement->DirectoryCB,
-                  lCount);
-
-    lCount = InterlockedIncrement( &DirectoryCB->OpenReferenceCount);
-
-    AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING,
-                  AFS_TRACE_LEVEL_VERBOSE,
-                  "AFSReplaceCurrentElement Increment count on %wZ DE %p Cnt %d\n",
-                  &DirectoryCB->NameInformation.FileName,
-                  DirectoryCB,
-                  lCount);
-
-    pCurrentElement->DirectoryCB = DirectoryCB;
-
-    pCurrentElement->Component = DirectoryCB->NameInformation.FileName;
-
-    pCurrentElement->FileId = DirectoryCB->ObjectInformation->FileId;
-
-    pCurrentElement->Flags = 0;
-
-    if( pCurrentElement->FileId.Vnode == 1)
-    {
-
-        SetFlag( pCurrentElement->Flags, AFS_NAME_ARRAY_FLAG_ROOT_ELEMENT);
-    }
-
-    return;
-}
-
 AFSDirectoryCB *
 AFSBackupEntry( IN AFSNameArrayHdr *NameArray)
 {
 
     AFSDirectoryCB *pDirectoryCB = NULL;
     AFSNameArrayCB *pCurrentElement = NULL;
+    BOOLEAN         bVolumeRoot = FALSE;
     LONG lCount;
 
     __Enter
@@ -5468,6 +5398,9 @@ AFSBackupEntry( IN AFSNameArrayHdr *NameArray)
         }
         else
         {
+
+            bVolumeRoot = BooleanFlagOn( NameArray->CurrentEntry->Flags, AFS_NAME_ARRAY_FLAG_ROOT_ELEMENT);
+
             NameArray->CurrentEntry--;
 
             pCurrentElement = NameArray->CurrentEntry;
@@ -5488,6 +5421,17 @@ AFSBackupEntry( IN AFSNameArrayHdr *NameArray)
                           pCurrentElement->DirectoryCB->ObjectInformation->FileType);
         }
 
+        //
+        // If the entry we are removing is a volume root,
+        // we must remove the mount point entry as well.
+        //
+
+        if ( bVolumeRoot)
+        {
+
+            pDirectoryCB = AFSBackupEntry( NameArray);
+        }
+
 try_exit:
 
         NOTHING;

diff --git a/src/WINNT/afsrdr/kernel/lib/AFSNameSupport.cpp b/src/WINNT/afsrdr/kernel/lib/AFSNameSupport.cpp
index 40da6eea2f93a2b3450f12c84b80185a679662a6..18a291d5f03dc63ed46ad32552f2c2a663a24f56 100644 (file)
--- a/src/WINNT/afsrdr/kernel/lib/AFSNameSupport.cpp
+++ b/src/WINNT/afsrdr/kernel/lib/AFSNameSupport.cpp
@@ -915,11 +915,12 @@ AFSLocateNameEntry( IN GUID *AuthGroup,
                     ASSERT( pCurrentVolume->VolumeReferenceCount > 1);
 
                     //
-                    // Replace the current name for the mp with the volume root of the target
+                    // The name array stores both the mount point and the target.
+                    // Insert the target.
                     //
 
-                    AFSReplaceCurrentElement( pNameArray,
-                                              pCurrentVolume->DirectoryCB);
+                    AFSInsertNextElement( pNameArray,
+                                          pCurrentVolume->DirectoryCB);
 
                     //
                     // We want to restart processing here on the new parent ...

diff --git a/src/WINNT/afsrdr/kernel/lib/Include/AFSCommon.h b/src/WINNT/afsrdr/kernel/lib/Include/AFSCommon.h
index 003b3a7118886cf8224863a4e3c1cc3a178d8775..ab3eb8e7f010100e7d1e9b55ede4a3ba3d0ea56f 100644 (file)
--- a/src/WINNT/afsrdr/kernel/lib/Include/AFSCommon.h
+++ b/src/WINNT/afsrdr/kernel/lib/Include/AFSCommon.h
@@ -1253,10 +1253,6 @@ NTSTATUS
 AFSInsertNextElement( IN AFSNameArrayHdr *NameArray,
                       IN AFSDirectoryCB *DirEntry);
 
-void
-AFSReplaceCurrentElement( IN AFSNameArrayHdr *NameArray,
-                          IN AFSDirectoryCB *DirectoryCB);
-
 AFSDirectoryCB *
 AFSBackupEntry( IN AFSNameArrayHdr *NameArray);