Merge remote-tracking branch 'dh/afs' into for-davem

2 files changed, 16 insertions, 5 deletions

diff --git a/fs/afs/misc.c b/fs/afs/misc.c
index 0dd4dafee10b..91ea1aa0d8b3 100644
--- a/fs/afs/misc.c
+++ b/fs/afs/misc.c
@@ -22,9 +22,12 @@
 int afs_abort_to_error(u32 abort_code)
 {
         switch (abort_code) {
+        /* low errno codes inserted into abort namespace */
         case 13:                return -EACCES;
         case 27:                return -EFBIG;
         case 30:                return -EROFS;
+
+        /* VICE "special error" codes; 101 - 111 */
         case VSALVAGE:          return -EIO;
         case VNOVNODE:          return -ENOENT;
         case VNOVOL:            return -ENOMEDIUM;
@@ -36,11 +39,18 @@ int afs_abort_to_error(u32 abort_code)
         case VOVERQUOTA:        return -EDQUOT;
         case VBUSY:             return -EBUSY;
         case VMOVED:            return -ENXIO;
-        case 0x2f6df0a:         return -EWOULDBLOCK;
+
+        /* 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;
@@ -54,8 +64,12 @@ int afs_abort_to_error(u32 abort_code)
         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;
 
+        /* RXKAD abort codes; from include/rxrpc/packet.h.  ET "RXK" == 0x1260B00 */
         case RXKADINCONSISTENCY: return -EPROTO;
         case RXKADPACKETSHORT:  return -EPROTO;
         case RXKADLEVELFAIL:    return -EKEYREJECTED;
diff --git a/fs/afs/rxrpc.c b/fs/afs/rxrpc.c
index dbc732e9a5c0..3a57a1b0fb51 100644
--- a/fs/afs/rxrpc.c
+++ b/fs/afs/rxrpc.c
@@ -770,15 +770,12 @@ static int afs_deliver_cm_op_id(struct afs_call *call, struct sk_buff *skb,
 void afs_send_empty_reply(struct afs_call *call)
 {
         struct msghdr msg;
-        struct kvec iov[1];
 
         _enter("");
 
-        iov[0].iov_base         = NULL;
-        iov[0].iov_len          = 0;
         msg.msg_name            = NULL;
         msg.msg_namelen         = 0;
-        iov_iter_kvec(&msg.msg_iter, WRITE | ITER_KVEC, iov, 0, 0);     /* WTF? */
+        iov_iter_kvec(&msg.msg_iter, WRITE | ITER_KVEC, NULL, 0, 0);
         msg.msg_control         = NULL;
         msg.msg_controllen      = 0;
         msg.msg_flags           = 0;