From: Jeffrey Altman <jaltman@your-file-system.com>
Date: Thu, 1 Dec 2011 04:28:46 +0000 (-0500)
Subject: Windows: do not set CM_SCACHEFLAG_EACCES twice
X-Git-Tag: upstream/1.8.0_pre1^2~2994
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=79833cbc64c8ccd051060782a381af1ad0cc8d50;p=packages%2Fo%2Fopenafs.git

Windows: do not set CM_SCACHEFLAG_EACCES twice

correct a merge error.

Change-Id: Iaf57703403a5c7555da730be0907bd31c9dfb34f
Reviewed-on: http://gerrit.openafs.org/6158
Reviewed-by: Jeffrey Altman <jaltman@secure-endpoints.com>
Tested-by: Jeffrey Altman <jaltman@secure-endpoints.com>
---

diff --git a/src/WINNT/afsd/cm_scache.c b/src/WINNT/afsd/cm_scache.c
index dcbe79b5a..a4fccdcc1 100644
--- a/src/WINNT/afsd/cm_scache.c
+++ b/src/WINNT/afsd/cm_scache.c
@@ -1567,7 +1567,6 @@ void cm_MergeStatus(cm_scache_t *dscp,
 #endif /* AFS_FREELANCE_CLIENT */
 
     if (statusp->errorCode != 0) {
-	_InterlockedOr(&scp->flags, CM_SCACHEFLAG_EACCESS);
         switch (statusp->errorCode) {
         case EACCES:
         case UAEACCES: