From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Tue, 30 May 2006 17:57:38 +0000 (+0000)
Subject: STABLE14-windows-smb-fid-deadlock-20060530
X-Git-Tag: openafs-stable-1_4_1c~6
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=767677783f8d20c6847f784bb8d3a23a65cbec53;p=packages%2Fo%2Fopenafs.git

STABLE14-windows-smb-fid-deadlock-20060530


remove a deadlock introduced in 1.4.1


(cherry picked from commit 134669a912a99b212fb4768d2a9a969cda5fffff)
---

diff --git a/src/WINNT/afsd/smb.c b/src/WINNT/afsd/smb.c
index f50dca863..c5cd23ffa 100644
--- a/src/WINNT/afsd/smb.c
+++ b/src/WINNT/afsd/smb.c
@@ -1452,9 +1452,9 @@ void smb_ReleaseFID(smb_fid_t *fidp)
     smb_vc_t *vcp = NULL;
     smb_ioctl_t *ioctlp;
 
+    lock_ObtainMutex(&fidp->mx);
     lock_ObtainWrite(&smb_rctLock);
     osi_assert(fidp->refCount-- > 0);
-    lock_ObtainMutex(&fidp->mx);
     if (fidp->refCount == 0 && (fidp->delete)) {
 	vcp = fidp->vcp;
 	fidp->vcp = NULL;