From: Jeffrey Altman <jaltman@your-file-system.com>
Date: Fri, 19 Aug 2011 01:57:12 +0000 (-0400)
Subject: Windows: be explicit when mapping sharing violation
X-Git-Tag: upstream/1.6.1.pre4^2~45
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=3abed6bdbbc08c8362a327fd6ede493a08798cc5;p=packages%2Fo%2Fopenafs.git

Windows: be explicit when mapping sharing violation

Only one lock acquistion failure should be mapping to
CM_ERROR_SHARING_VIOLATION.  That is CM_ERROR_LOCK_NOT_GRANTED.
Make it clear that is what we are doing.

Reviewed-on: http://gerrit.openafs.org/5299
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
Tested-by: Jeffrey Altman <jaltman@openafs.org>
(cherry picked from commit a576ff1e53a539e88b9f3fa6b8132d4f161b0bd4)

Change-Id: I558c6989a2a8f4042129e2a60bcd340a7863222c
Reviewed-on: http://gerrit.openafs.org/6796
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
---

diff --git a/src/WINNT/afsd/cm_vnodeops.c b/src/WINNT/afsd/cm_vnodeops.c
index b44bd432f..0c387d22d 100644
--- a/src/WINNT/afsd/cm_vnodeops.c
+++ b/src/WINNT/afsd/cm_vnodeops.c
@@ -156,17 +156,8 @@ long cm_CheckOpen(cm_scache_t *scp, int openMode, int trunc, cm_user_t *userp,
                 !(rights & PRSFS_WRITE))
                 code = 0;
             else {
-		switch (code) {
-		case CM_ERROR_ALLOFFLINE:
-		case CM_ERROR_ALLDOWN:
-		case CM_ERROR_ALLBUSY:
-		case CM_ERROR_TIMEDOUT:
-		case CM_ERROR_RETRY:
-		case CM_ERROR_WOULDBLOCK:
-		    break;
-		default:
+		if (code == CM_ERROR_LOCK_NOT_GRANTED)
 		    code = CM_ERROR_SHARING_VIOLATION;
-		}
 	    }
         }
 
@@ -277,17 +268,8 @@ long cm_CheckNTOpen(cm_scache_t *scp, unsigned int desiredAccess,
                 !(rights & PRSFS_WRITE))
                 code = 0;
             else {
-		switch (code) {
-		case CM_ERROR_ALLOFFLINE:
-		case CM_ERROR_ALLDOWN:
-		case CM_ERROR_ALLBUSY:
-		case CM_ERROR_TIMEDOUT:
-		case CM_ERROR_RETRY:
-		case CM_ERROR_WOULDBLOCK:
-		    break;
-		default:
+		if (code == CM_ERROR_LOCK_NOT_GRANTED)
 		    code = CM_ERROR_SHARING_VIOLATION;
-		}
 	    }
         }
     } else if (code != 0) {