From 7257bdd0c3b77ce7d9763c11d3f11cbbc936facf Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Thu, 1 Jun 2006 16:41:23 +0000 Subject: [PATCH] DEVEL15-windows-smb-fid-deadlock-20060530 remove a deadlock introduced in 1.4.1 (cherry picked from commit 134669a912a99b212fb4768d2a9a969cda5fffff) --- src/WINNT/afsd/smb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/WINNT/afsd/smb.c b/src/WINNT/afsd/smb.c index 4b62388a41..bea1b0f8da 100644 --- a/src/WINNT/afsd/smb.c +++ b/src/WINNT/afsd/smb.c @@ -1517,9 +1517,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;