From: Jeffrey Altman <jaltman@your-file-system.com>
Date: Mon, 12 Mar 2012 19:53:47 +0000 (-0400)
Subject: Windows: Drop resource across AFSCleanupFcb
X-Git-Tag: upstream/1.8.0_pre1^2~2700
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=317b227a20a99960b313d06a3441822472d638c8;p=packages%2Fo%2Fopenafs.git

Windows: Drop resource across AFSCleanupFcb

Avoid additional deadlocks involving
VolumeCB->ObjectInfoTree.TreeLock.

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

diff --git a/src/WINNT/afsrdr/kernel/lib/AFSWorker.cpp b/src/WINNT/afsrdr/kernel/lib/AFSWorker.cpp
index b4adbeca4..6ad10312d 100644
--- a/src/WINNT/afsrdr/kernel/lib/AFSWorker.cpp
+++ b/src/WINNT/afsrdr/kernel/lib/AFSWorker.cpp
@@ -1534,9 +1534,14 @@ AFSPrimaryVolumeWorkerThread( IN PVOID Context)
                             if( pFcb != NULL)
                             {
 
+                                AFSReleaseResource( pVolumeCB->ObjectInfoTree.TreeLock);
+
                                 AFSCleanupFcb( pFcb,
                                                TRUE);
 
+                                AFSAcquireExcl( pVolumeCB->ObjectInfoTree.TreeLock,
+                                                TRUE);
+
                                 AFSRemoveFcb( &pFcb);
                             }
 
@@ -1565,8 +1570,13 @@ AFSPrimaryVolumeWorkerThread( IN PVOID Context)
                         else if( pCurrentObject->Fcb != NULL)
                         {
 
+                            AFSReleaseResource( pVolumeCB->ObjectInfoTree.TreeLock);
+
                             AFSCleanupFcb( pCurrentObject->Fcb,
                                            FALSE);
+
+                            AFSAcquireShared( pVolumeCB->ObjectInfoTree.TreeLock,
+                                              TRUE);
                         }
                     }