Merge tag 'afs-next-20190628' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowel...

[linux-2.6-microblaze.git] / fs / afs / misc.c

diff --git a/fs/afs/misc.c b/fs/afs/misc.c
index 5497ab3..52b19e9 100644 (file)
--- a/fs/afs/misc.c
+++ b/fs/afs/misc.c
@@ -10,6 +10,7 @@
 #include <linux/errno.h>
 #include "internal.h"
 #include "afs_fs.h"
+#include "protocol_uae.h"
 
 /*
  * convert an AFS abort code to a Linux error number
@@ -65,34 +66,25 @@ int afs_abort_to_error(u32 abort_code)
        case AFSVL_PERM:                return -EACCES;
        case AFSVL_NOMEM:               return -EREMOTEIO;
 
-               /* Unified AFS error table; ET "uae" == 0x2f6df00 */
-       case 0x2f6df00:         return -EPERM;
-       case 0x2f6df01:         return -ENOENT;
-       case 0x2f6df04:         return -EIO;
-       case 0x2f6df0a:         return -EAGAIN;
-       case 0x2f6df0b:         return -ENOMEM;
-       case 0x2f6df0c:         return -EACCES;
-       case 0x2f6df0f:         return -EBUSY;
-       case 0x2f6df10:         return -EEXIST;
-       case 0x2f6df11:         return -EXDEV;
-       case 0x2f6df12:         return -ENODEV;
-       case 0x2f6df13:         return -ENOTDIR;
-       case 0x2f6df14:         return -EISDIR;
-       case 0x2f6df15:         return -EINVAL;
-       case 0x2f6df1a:         return -EFBIG;
-       case 0x2f6df1b:         return -ENOSPC;
-       case 0x2f6df1d:         return -EROFS;
-       case 0x2f6df1e:         return -EMLINK;
-       case 0x2f6df20:         return -EDOM;
-       case 0x2f6df21:         return -ERANGE;
-       case 0x2f6df22:         return -EDEADLK;
-       case 0x2f6df23:         return -ENAMETOOLONG;
-       case 0x2f6df24:         return -ENOLCK;
-       case 0x2f6df26:         return -ENOTEMPTY;
-       case 0x2f6df28:         return -EWOULDBLOCK;
-       case 0x2f6df69:         return -ENOTCONN;
-       case 0x2f6df6c:         return -ETIMEDOUT;
-       case 0x2f6df78:         return -EDQUOT;
+               /* Unified AFS error table */
+       case UAEPERM:                   return -EPERM;
+       case UAENOENT:                  return -ENOENT;
+       case UAEACCES:                  return -EACCES;
+       case UAEBUSY:                   return -EBUSY;
+       case UAEEXIST:                  return -EEXIST;
+       case UAENOTDIR:                 return -ENOTDIR;
+       case UAEISDIR:                  return -EISDIR;
+       case UAEFBIG:                   return -EFBIG;
+       case UAENOSPC:                  return -ENOSPC;
+       case UAEROFS:                   return -EROFS;
+       case UAEMLINK:                  return -EMLINK;
+       case UAEDEADLK:                 return -EDEADLK;
+       case UAENAMETOOLONG:            return -ENAMETOOLONG;
+       case UAENOLCK:                  return -ENOLCK;
+       case UAENOTEMPTY:               return -ENOTEMPTY;
+       case UAELOOP:                   return -ELOOP;
+       case UAENOMEDIUM:               return -ENOMEDIUM;
+       case UAEDQUOT:                  return -EDQUOT;
 
                /* RXKAD abort codes; from include/rxrpc/packet.h.  ET "RXK" == 0x1260B00 */
        case RXKADINCONSISTENCY: return -EPROTO;