From: Jeffrey Altman <jaltman@your-file-system.com>
Date: Tue, 25 Sep 2012 16:59:04 +0000 (-0400)
Subject: Windows: duplicate ExtentsResource hold
X-Git-Tag: upstream/1.8.0_pre1^2~1954
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=ae8527269ca091d47a1232a0469921ba7c54f65b;p=packages%2Fo%2Fopenafs.git

Windows: duplicate ExtentsResource hold

All callers to AFSDoExtentsMapRegion() hold the ExtentsResource
so there is no need to obtain it again within the function.  Instead
add an ASSERT to confirm that the resource is held.

Change-Id: Id34a3d650062d6e519a66732d248c136a92e4be3
Reviewed-on: http://gerrit.openafs.org/8161
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
Tested-by: Jeffrey Altman <jaltman@your-file-system.com>
---

diff --git a/src/WINNT/afsrdr/kernel/lib/AFSExtentsSupport.cpp b/src/WINNT/afsrdr/kernel/lib/AFSExtentsSupport.cpp
index 3e5b68e85..2650de601 100644
--- a/src/WINNT/afsrdr/kernel/lib/AFSExtentsSupport.cpp
+++ b/src/WINNT/afsrdr/kernel/lib/AFSExtentsSupport.cpp
@@ -629,13 +629,7 @@ BOOLEAN AFSDoExtentsMapRegion(IN AFSFcb *Fcb,
     __Enter
     {
 
-        AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING,
-                      AFS_TRACE_LEVEL_VERBOSE,
-                      "AFSDoExtentsMapRegion Acquiring Fcb extent lock %08lX SHARED %08lX\n",
-                      &Fcb->NPFcb->Specific.File.ExtentsResource,
-                      PsGetCurrentThread());
-
-        AFSAcquireShared( &Fcb->NPFcb->Specific.File.ExtentsResource, TRUE );
+        ASSERT( ExIsResourceAcquiredLite( &Fcb->NPFcb->Specific.File.ExtentsResource ));
 
         __try
         {
@@ -694,14 +688,6 @@ BOOLEAN AFSDoExtentsMapRegion(IN AFSFcb *Fcb,
 
 try_exit:
 
-        AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING,
-                      AFS_TRACE_LEVEL_VERBOSE,
-                      "AFSDoExtentsMapRegion Releasing Fcb extent lock %08lX SHARED %08lX\n",
-                      &Fcb->NPFcb->Specific.File.ExtentsResource,
-                      PsGetCurrentThread());
-
-        AFSReleaseResource( &Fcb->NPFcb->Specific.File.ExtentsResource );
-
         *LastExtent = entry;
     }