From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Wed, 3 Sep 2008 21:41:04 +0000 (+0000)
Subject: DEVEL15-windows-smb-lock-order-20080903
X-Git-Tag: openafs-devel-1_5_53~50
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=9ac229a2c1fcfc6ca5afa687960060d258a57012;p=packages%2Fo%2Fopenafs.git

DEVEL15-windows-smb-lock-order-20080903

LICENSE MIT

another lock order violation to fix


(cherry picked from commit 441cc643e027ab98ed14ab486ec077bbbd0c0d4f)
---

diff --git a/src/WINNT/afsd/smb.c b/src/WINNT/afsd/smb.c
index 3263515bb..d77ca29d1 100644
--- a/src/WINNT/afsd/smb.c
+++ b/src/WINNT/afsd/smb.c
@@ -9863,6 +9863,7 @@ void smb_Shutdown(void)
             if (fidp->scp != NULL) {
                 cm_scache_t * scp;
 
+                lock_ReleaseWrite(&smb_rctLock);
                 lock_ObtainMutex(&fidp->mx);
                 if (fidp->scp != NULL) {
                     scp = fidp->scp;
@@ -9874,6 +9875,7 @@ void smb_Shutdown(void)
                     cm_ReleaseSCache(scp);
                 }
                 lock_ReleaseMutex(&fidp->mx);
+                lock_ObtainWrite(&smb_rctLock);
             }
         }