From: Jeffrey Altman <jaltman@your-file-system.com>
Date: Mon, 30 Apr 2012 10:18:58 +0000 (-0400)
Subject: Windows: VNOSERVICE error translation
X-Git-Tag: upstream/1.6.2_pre2^2~57
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=d2614e34652ef9e9ddaa4fc36fd905171e3f9993;p=packages%2Fo%2Fopenafs.git

Windows: VNOSERVICE error translation

Translate VNOSERVICE as CM_ERROR_RETRY and not CM_ERROR_OFFLINE.

Reviewed-on: http://gerrit.openafs.org/7307
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Tested-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
Reviewed-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
Reviewed-by: Jeffrey Altman <jaltman@secure-endpoints.com>
Tested-by: Jeffrey Altman <jaltman@secure-endpoints.com>
(cherry picked from commit f70a12adef9a915ada728350e0b9e1e5104f7ea7)

Change-Id: I3f01144863c25a2081f7ea2890299bb509a10a4a
Reviewed-on: http://gerrit.openafs.org/8622
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
---

diff --git a/src/WINNT/afsd/cm_utils.c b/src/WINNT/afsd/cm_utils.c
index 9d8ae78e9..fc3673fce 100644
--- a/src/WINNT/afsd/cm_utils.c
+++ b/src/WINNT/afsd/cm_utils.c
@@ -211,7 +211,8 @@ long cm_MapRPCError(long error, cm_req_t *reqp)
     if (error == RX_CALL_DEAD ||
         error == RX_CALL_TIMEOUT ||
         error == RX_CALL_BUSY ||
-        error == RX_MSGSIZE)
+        error == RX_MSGSIZE ||
+        error == VNOSERVICE)
         error = CM_ERROR_RETRY;
     else if (error == RX_CALL_IDLE)
         error = EIO;
@@ -248,7 +249,7 @@ long cm_MapRPCError(long error, cm_req_t *reqp)
         error = CM_ERROR_QUOTA;
     else if (error == VNOVNODE)
         error = CM_ERROR_BADFD;
-    else if (error == VNOSERVICE || error == VSALVAGE || error == VOFFLINE)
+    else if (error == VSALVAGE || error == VOFFLINE)
         error = CM_ERROR_ALLOFFLINE;
     else if (error == VBUSY || error == VRESTARTING)
         error = CM_ERROR_ALLBUSY;
@@ -279,11 +280,12 @@ long cm_MapRPCErrorRmdir(long error, cm_req_t *reqp)
         error == RX_CALL_TIMEOUT ||
         error == RX_CALL_BUSY ||
         error == RX_CALL_IDLE ||
-        error == RX_MSGSIZE)
+        error == RX_MSGSIZE ||
+        error == VNOSERVICE)
         error = CM_ERROR_RETRY;
     else if (error == VNOVNODE)
         error = CM_ERROR_BADFD;
-    else if (error == VNOSERVICE || error == VSALVAGE || error == VOFFLINE)
+    else if (error == VSALVAGE || error == VOFFLINE)
         error = CM_ERROR_ALLOFFLINE;
     else if (error == VBUSY || error == VRESTARTING)
         error = CM_ERROR_ALLBUSY;
@@ -329,7 +331,8 @@ long cm_MapVLRPCError(long error, cm_req_t *reqp)
         error == RX_CALL_TIMEOUT ||
         error == RX_CALL_BUSY ||
         error == RX_CALL_IDLE ||
-        error == RX_MSGSIZE)
+        error == RX_MSGSIZE ||
+        error == VNOSERVICE)
         error = CM_ERROR_RETRY;
     else if (error == RX_RESTARTING)
         error = CM_ERROR_ALLBUSY;