Windows: remove AFSOpenRedirector from AFSRedirLib

The AFSOpenRedirector functionality must exist in the framework,
AFSRedir.sys, not the library, AFSRedirLib.sys.

Change-Id: Id688efba016d94df558b241e9bee421c86c60e27
Reviewed-on: http://gerrit.openafs.org/6781
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Tested-by: Jeffrey Altman <jaltman@secure-endpoints.com>
Reviewed-by: Jeffrey Altman <jaltman@secure-endpoints.com>

diff --git a/src/WINNT/afsrdr/kernel/lib/AFSCreate.cpp b/src/WINNT/afsrdr/kernel/lib/AFSCreate.cpp
index 7777da9..1dd8be6 100644 (file)
--- a/src/WINNT/afsrdr/kernel/lib/AFSCreate.cpp
+++ b/src/WINNT/afsrdr/kernel/lib/AFSCreate.cpp
@@ -1260,79 +1260,6 @@ try_exit:
 }
 
 NTSTATUS
-AFSOpenRedirector( IN PIRP Irp,
-                   IN AFSFcb **Fcb,
-                   IN AFSCcb **Ccb)
-{
-
-    NTSTATUS ntStatus = STATUS_SUCCESS;
-    LONG lCount;
-
-    __Enter
-    {
-
-        //
-        // Initialize the Ccb for the file.
-        //
-
-        ntStatus = AFSInitCcb( Ccb);
-
-        if( !NT_SUCCESS( ntStatus))
-        {
-
-            AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING,
-                          AFS_TRACE_LEVEL_ERROR,
-                          "AFSOpenRedirector (%08lX) Failed to allocate Ccb\n",
-                          Irp);
-
-            try_return( ntStatus);
-        }
-
-        //
-        // Setup the Ccb
-        //
-
-        (*Ccb)->DirectoryCB = AFSRedirectorRoot->DirectoryCB;
-
-        //
-        // Increment the open count on this Fcb
-        //
-
-        lCount = InterlockedIncrement( &AFSRedirectorRoot->RootFcb->OpenReferenceCount);
-
-        AFSDbgLogMsg( AFS_SUBSYSTEM_FCB_REF_COUNTING,
-                      AFS_TRACE_LEVEL_VERBOSE,
-                      "AFSOpenRedirector Increment count on Fcb %08lX Cnt %d\n",
-                      AFSRedirectorRoot->RootFcb,
-                      lCount);
-
-        lCount = InterlockedIncrement( &AFSRedirectorRoot->RootFcb->OpenHandleCount);
-
-        AFSDbgLogMsg( AFS_SUBSYSTEM_FCB_REF_COUNTING,
-                      AFS_TRACE_LEVEL_VERBOSE,
-                      "AFSOpenRedirector Increment handle count on Fcb %08lX Cnt %d\n",
-                      AFSRedirectorRoot->RootFcb,
-                      lCount);
-
-        *Fcb = AFSRedirectorRoot->RootFcb;
-
-        lCount = InterlockedIncrement( &(*Ccb)->DirectoryCB->OpenReferenceCount);
-
-        //
-        // Return the open result for this file
-        //
-
-        Irp->IoStatus.Information = FILE_OPENED;
-
-try_exit:
-
-        NOTHING;
-    }
-
-    return ntStatus;
-}
-
-NTSTATUS
 AFSOpenAFSRoot( IN PIRP Irp,
                 IN AFSFcb **Fcb,
                 IN AFSCcb **Ccb)

diff --git a/src/WINNT/afsrdr/kernel/lib/AFSData.cpp b/src/WINNT/afsrdr/kernel/lib/AFSData.cpp
index d892c12..7483916 100644 (file)
--- a/src/WINNT/afsrdr/kernel/lib/AFSData.cpp
+++ b/src/WINNT/afsrdr/kernel/lib/AFSData.cpp
@@ -58,8 +58,6 @@ UNICODE_STRING      AFSServerName;
 
 AFSVolumeCB        *AFSGlobalRoot = NULL;
 
-AFSVolumeCB        *AFSRedirectorRoot = NULL;
-
 UNICODE_STRING      AFSPIOCtlName;
 
 UNICODE_STRING      AFSGlobalRootName;

diff --git a/src/WINNT/afsrdr/kernel/lib/Include/AFSExtern.h b/src/WINNT/afsrdr/kernel/lib/Include/AFSExtern.h
index f38652b..3d67152 100644 (file)
--- a/src/WINNT/afsrdr/kernel/lib/Include/AFSExtern.h
+++ b/src/WINNT/afsrdr/kernel/lib/Include/AFSExtern.h
@@ -63,8 +63,6 @@ extern UNICODE_STRING      AFSServerName;
 
 extern AFSVolumeCB        *AFSGlobalRoot;
 
-extern AFSVolumeCB        *AFSRedirectorRoot;
-
 extern UNICODE_STRING      AFSPIOCtlName;
 
 extern UNICODE_STRING      AFSGlobalRootName;