1 files changed, 14 insertions, 14 deletions

diff --git a/fs/afs/vlclient.c b/fs/afs/vlclient.c
index 5d8562f1ad4a..1ed7e2fd2f35 100644
--- a/fs/afs/vlclient.c
+++ b/fs/afs/vlclient.c
@@ -303,7 +303,7 @@ struct afs_addr_list *afs_vl_get_addrs_u(struct afs_net *net,
         r->uuid.clock_seq_hi_and_reserved       = htonl(u->clock_seq_hi_and_reserved);
         r->uuid.clock_seq_low                   = htonl(u->clock_seq_low);
         for (i = 0; i < 6; i++)
-                r->uuid.node[i] = ntohl(u->node[i]);
+                r->uuid.node[i] = htonl(u->node[i]);
 
         trace_afs_make_vl_call(call);
         return (struct afs_addr_list *)afs_make_call(ac, call, GFP_KERNEL, false);
@@ -450,7 +450,7 @@ again:
                 call->count2    = ntohl(*bp); /* Type or next count */
 
                 if (call->count > YFS_MAXENDPOINTS)
-                        return -EBADMSG;
+                        return afs_protocol_error(call, -EBADMSG);
 
                 alist = afs_alloc_addrlist(call->count, FS_SERVICE, AFS_FS_PORT);
                 if (!alist)
@@ -474,7 +474,7 @@ again:
                         size = sizeof(__be32) * (1 + 4 + 1);
                         break;
                 default:
-                        return -EBADMSG;
+                        return afs_protocol_error(call, -EBADMSG);
                 }
 
                 size += sizeof(__be32);
@@ -487,24 +487,24 @@ again:
                 switch (call->count2) {
                 case YFS_ENDPOINT_IPV4:
                         if (ntohl(bp[0]) != sizeof(__be32) * 2)
-                                return -EBADMSG;
+                                return afs_protocol_error(call, -EBADMSG);
                         afs_merge_fs_addr4(alist, bp[1], ntohl(bp[2]));
                         bp += 3;
                         break;
                 case YFS_ENDPOINT_IPV6:
                         if (ntohl(bp[0]) != sizeof(__be32) * 5)
-                                return -EBADMSG;
+                                return afs_protocol_error(call, -EBADMSG);
                         afs_merge_fs_addr6(alist, bp + 1, ntohl(bp[5]));
                         bp += 6;
                         break;
                 default:
-                        return -EBADMSG;
+                        return afs_protocol_error(call, -EBADMSG);
                 }
 
                 /* Got either the type of the next entry or the count of
                  * volEndpoints if no more fsEndpoints.
                  */
-                call->count2 = htonl(*bp++);
+                call->count2 = ntohl(*bp++);
 
                 call->offset = 0;
                 call->count--;
@@ -517,7 +517,7 @@ again:
                 if (!call->count)
                         goto end;
                 if (call->count > YFS_MAXENDPOINTS)
-                        return -EBADMSG;
+                        return afs_protocol_error(call, -EBADMSG);
 
                 call->unmarshall = 3;
 
@@ -531,7 +531,7 @@ again:
                         return ret;
 
                 bp = call->buffer;
-                call->count2 = htonl(*bp++);
+                call->count2 = ntohl(*bp++);
                 call->offset = 0;
                 call->unmarshall = 4;
 
@@ -545,7 +545,7 @@ again:
                         size = sizeof(__be32) * (1 + 4 + 1);
                         break;
                 default:
-                        return -EBADMSG;
+                        return afs_protocol_error(call, -EBADMSG);
                 }
 
                 if (call->count > 1)
@@ -558,16 +558,16 @@ again:
                 switch (call->count2) {
                 case YFS_ENDPOINT_IPV4:
                         if (ntohl(bp[0]) != sizeof(__be32) * 2)
-                                return -EBADMSG;
+                                return afs_protocol_error(call, -EBADMSG);
                         bp += 3;
                         break;
                 case YFS_ENDPOINT_IPV6:
                         if (ntohl(bp[0]) != sizeof(__be32) * 5)
-                                return -EBADMSG;
+                                return afs_protocol_error(call, -EBADMSG);
                         bp += 6;
                         break;
                 default:
-                        return -EBADMSG;
+                        return afs_protocol_error(call, -EBADMSG);
                 }
 
                 /* Got either the type of the next entry or the count of
@@ -576,7 +576,7 @@ again:
                 call->offset = 0;
                 call->count--;
                 if (call->count > 0) {
-                        call->count2 = htonl(*bp++);
+                        call->count2 = ntohl(*bp++);
                         goto again;
                 }