From: Jeffrey Altman <jaltman@your-file-system.com>
Date: Wed, 7 Nov 2012 21:34:23 +0000 (-0500)
Subject: Windows: RDR_CleanupFileEntry protect lock release
X-Git-Tag: upstream/1.8.0_pre1^2~1836
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=30ee8b645ea28b8f4f4794b2620fef723d03de9d;p=packages%2Fo%2Fopenafs.git

Windows: RDR_CleanupFileEntry protect lock release

Prevent lock release of scp->rw when not held.

Change-Id: I9ed3ca464a7881cd365ebe3560d5a6da22e21c86
Reviewed-on: http://gerrit.openafs.org/8372
Tested-by: BuildBot <buildbot@rampaginggeek.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/user/RDRFunction.c b/src/WINNT/afsrdr/user/RDRFunction.c
index 24d1483a8..0c1200709 100644
--- a/src/WINNT/afsrdr/user/RDRFunction.c
+++ b/src/WINNT/afsrdr/user/RDRFunction.c
@@ -1907,8 +1907,10 @@ RDR_CleanupFileEntry( IN cm_user_t *userp,
 
         /* call setattr */
         if (setAttr.mask) {
-            lock_ReleaseWrite(&scp->rw);
-            bScpLocked = FALSE;
+            if (bScpLocked) {
+                lock_ReleaseWrite(&scp->rw);
+                bScpLocked = FALSE;
+            }
             code = cm_SetAttr(scp, &setAttr, userp, &req);
         } else
             code = 0;