From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Wed, 31 Oct 2007 15:18:10 +0000 (+0000)
Subject: windows-uaewouldblock-20071031
X-Git-Tag: BP-openafs-windows-kdfs-ifs~401
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=d16d5c031274e05ea27f12965e094ae42d8af9e5;p=packages%2Fo%2Fopenafs.git

windows-uaewouldblock-20071031


Reorganize the order of the includes to ensure that EWOULDBLOCK is not
assigned the same value as EIO.
---

diff --git a/src/WINNT/afsd/cm_utils.c b/src/WINNT/afsd/cm_utils.c
index 090e3e1c4..634c925fe 100644
--- a/src/WINNT/afsd/cm_utils.c
+++ b/src/WINNT/afsd/cm_utils.c
@@ -13,7 +13,6 @@
 #include <errno.h>
 #include <windows.h>
 #include <winsock2.h>
-#include <afs/unified_afs.h>
 #ifndef EWOULDBLOCK
 #define EWOULDBLOCK             WSAEWOULDBLOCK
 #define EINPROGRESS             WSAEINPROGRESS
@@ -62,6 +61,7 @@
 #define ESTALE                  WSAESTALE
 #define EREMOTE                 WSAEREMOTE
 #endif /* EWOULDBLOCK */
+#include <afs/unified_afs.h>
 
 #include <string.h>
 #include <malloc.h>
@@ -249,8 +249,9 @@ long cm_MapRPCError(long error, cm_req_t *reqp)
         error = CM_ERROR_NOTDIR;
     else if (error == 2)	/* ENOENT */
         error = CM_ERROR_NOSUCHFILE;
-    else if (error == 11        /* EAGAIN, most servers */
-             || error == 35)	/* EAGAIN, Digital UNIX */
+    else if (error == 11           /* EAGAIN, most servers */
+             || error == 35 	   /* EAGAIN, Digital UNIX */
+             || error == WSAEWOULDBLOCK)
         error = CM_ERROR_WOULDBLOCK;
     else if (error == VDISKFULL
               || error == 28)   /* ENOSPC */