afs: Remove the error argument from afs_protocol_error()

Remove the error argument from afs_protocol_error() as it's always
-EBADMSG.

Signed-off-by: David Howells <dhowells@redhat.com>

diff --git a/fs/afs/cmservice.c b/fs/afs/cmservice.c
index 7ae88958051f7cc1fcf5a40e4f858d93dc647a51..ed0fb34d77dd825c29009df4a336ba23a8cce370 100644 (file)
--- a/fs/afs/cmservice.c
+++ b/fs/afs/cmservice.c
@@ -307,8 +307,7 @@ static int afs_deliver_cb_callback(struct afs_call *call)
                call->count = ntohl(call->tmp);
                _debug("FID count: %u", call->count);
                if (call->count > AFSCBMAX)
-                       return afs_protocol_error(call, -EBADMSG,
-                                                 afs_eproto_cb_fid_count);
+                       return afs_protocol_error(call, afs_eproto_cb_fid_count);
 
                call->buffer = kmalloc(array3_size(call->count, 3, 4),
                                       GFP_KERNEL);
@@ -353,8 +352,7 @@ static int afs_deliver_cb_callback(struct afs_call *call)
                call->count2 = ntohl(call->tmp);
                _debug("CB count: %u", call->count2);
                if (call->count2 != call->count && call->count2 != 0)
-                       return afs_protocol_error(call, -EBADMSG,
-                                                 afs_eproto_cb_count);
+                       return afs_protocol_error(call, afs_eproto_cb_count);
                call->iter = &call->def_iter;
                iov_iter_discard(&call->def_iter, READ, call->count2 * 3 * 4);
                call->unmarshall++;
@@ -674,8 +672,7 @@ static int afs_deliver_yfs_cb_callback(struct afs_call *call)
                call->count = ntohl(call->tmp);
                _debug("FID count: %u", call->count);
                if (call->count > YFSCBMAX)
-                       return afs_protocol_error(call, -EBADMSG,
-                                                 afs_eproto_cb_fid_count);
+                       return afs_protocol_error(call, afs_eproto_cb_fid_count);
 
                size = array_size(call->count, sizeof(struct yfs_xdr_YFSFid));
                call->buffer = kmalloc(size, GFP_KERNEL);

diff --git a/fs/afs/fsclient.c b/fs/afs/fsclient.c
index b1d8d8f780d2035dddc80c97e63b5e91cc5c57bf..7d4503174dd1040db138e83720e97c5fefbfb2ea 100644 (file)
--- a/fs/afs/fsclient.c
+++ b/fs/afs/fsclient.c
@@ -130,7 +130,7 @@ advance:
 
 bad:
        xdr_dump_bad(*_bp);
-       afs_protocol_error(call, -EBADMSG, afs_eproto_bad_status);
+       afs_protocol_error(call, afs_eproto_bad_status);
        goto advance;
 }
 
@@ -1470,8 +1470,7 @@ static int afs_deliver_fs_get_volume_status(struct afs_call *call)
                call->count = ntohl(call->tmp);
                _debug("volname length: %u", call->count);
                if (call->count >= AFSNAMEMAX)
-                       return afs_protocol_error(call, -EBADMSG,
-                                                 afs_eproto_volname_len);
+                       return afs_protocol_error(call, afs_eproto_volname_len);
                size = (call->count + 3) & ~3; /* It's padded */
                afs_extract_to_buf(call, size);
                call->unmarshall++;
@@ -1500,8 +1499,7 @@ static int afs_deliver_fs_get_volume_status(struct afs_call *call)
                call->count = ntohl(call->tmp);
                _debug("offline msg length: %u", call->count);
                if (call->count >= AFSNAMEMAX)
-                       return afs_protocol_error(call, -EBADMSG,
-                                                 afs_eproto_offline_msg_len);
+                       return afs_protocol_error(call, afs_eproto_offline_msg_len);
                size = (call->count + 3) & ~3; /* It's padded */
                afs_extract_to_buf(call, size);
                call->unmarshall++;
@@ -1531,8 +1529,7 @@ static int afs_deliver_fs_get_volume_status(struct afs_call *call)
                call->count = ntohl(call->tmp);
                _debug("motd length: %u", call->count);
                if (call->count >= AFSNAMEMAX)
-                       return afs_protocol_error(call, -EBADMSG,
-                                                 afs_eproto_motd_len);
+                       return afs_protocol_error(call, afs_eproto_motd_len);
                size = (call->count + 3) & ~3; /* It's padded */
                afs_extract_to_buf(call, size);
                call->unmarshall++;
@@ -2012,8 +2009,7 @@ static int afs_deliver_fs_inline_bulk_status(struct afs_call *call)
                tmp = ntohl(call->tmp);
                _debug("status count: %u/%u", tmp, call->count2);
                if (tmp != call->count2)
-                       return afs_protocol_error(call, -EBADMSG,
-                                                 afs_eproto_ibulkst_count);
+                       return afs_protocol_error(call, afs_eproto_ibulkst_count);
 
                call->count = 0;
                call->unmarshall++;
@@ -2049,8 +2045,7 @@ static int afs_deliver_fs_inline_bulk_status(struct afs_call *call)
                tmp = ntohl(call->tmp);
                _debug("CB count: %u", tmp);
                if (tmp != call->count2)
-                       return afs_protocol_error(call, -EBADMSG,
-                                                 afs_eproto_ibulkst_cb_count);
+                       return afs_protocol_error(call, afs_eproto_ibulkst_cb_count);
                call->count = 0;
                call->unmarshall++;
        more_cbs:

diff --git a/fs/afs/inode.c b/fs/afs/inode.c
index 281470fe1183c10dc1621d6f754780e304058444..07933d106e0e03ecd7b071ce38bf041dbd03eaad 100644 (file)
--- a/fs/afs/inode.c
+++ b/fs/afs/inode.c
@@ -130,7 +130,7 @@ static int afs_inode_init_from_status(struct afs_vnode *vnode, struct key *key,
        default:
                dump_vnode(vnode, parent_vnode);
                write_sequnlock(&vnode->cb_lock);
-               return afs_protocol_error(NULL, -EBADMSG, afs_eproto_file_type);
+               return afs_protocol_error(NULL, afs_eproto_file_type);
        }
 
        afs_set_i_size(vnode, status->size);
@@ -179,7 +179,7 @@ static void afs_apply_status(struct afs_fs_cursor *fc,
                        vnode->fid.vnode,
                        vnode->fid.unique,
                        status->type, vnode->status.type);
-               afs_protocol_error(NULL, -EBADMSG, afs_eproto_bad_status);
+               afs_protocol_error(NULL, afs_eproto_bad_status);
                return;
        }
 

diff --git a/fs/afs/internal.h b/fs/afs/internal.h
index 6d5c66dd76deeee1c9f4cfba672df7683a5f263a..468bd2b0470dd7fe487e786bed7f960a5274f95b 100644 (file)
--- a/fs/afs/internal.h
+++ b/fs/afs/internal.h
@@ -1133,7 +1133,7 @@ extern void afs_flat_call_destructor(struct afs_call *);
 extern void afs_send_empty_reply(struct afs_call *);
 extern void afs_send_simple_reply(struct afs_call *, const void *, size_t);
 extern int afs_extract_data(struct afs_call *, bool);
-extern int afs_protocol_error(struct afs_call *, int, enum afs_eproto_cause);
+extern int afs_protocol_error(struct afs_call *, enum afs_eproto_cause);
 
 static inline void afs_set_fc_call(struct afs_call *call, struct afs_fs_cursor *fc)
 {

diff --git a/fs/afs/rxrpc.c b/fs/afs/rxrpc.c
index c84d571782d7519cb4a19b3702e0591e4a2b3eae..00b87bac4fec3419f208870fab92d2e0be62fc17 100644 (file)
--- a/fs/afs/rxrpc.c
+++ b/fs/afs/rxrpc.c
@@ -961,11 +961,11 @@ int afs_extract_data(struct afs_call *call, bool want_more)
 /*
  * Log protocol error production.
  */
-noinline int afs_protocol_error(struct afs_call *call, int error,
+noinline int afs_protocol_error(struct afs_call *call,
                                enum afs_eproto_cause cause)
 {
-       trace_afs_protocol_error(call, error, cause);
+       trace_afs_protocol_error(call, cause);
        if (call)
                call->unmarshalling_error = true;
-       return error;
+       return -EBADMSG;
 }

diff --git a/fs/afs/vlclient.c b/fs/afs/vlclient.c
index 972dc5512f335350684d90b26ce5a7d75f2f5f36..d0c85623ce8fc229be04d3442d18873b06c4c297 100644 (file)
--- a/fs/afs/vlclient.c
+++ b/fs/afs/vlclient.c
@@ -448,8 +448,7 @@ static int afs_deliver_yfsvl_get_endpoints(struct afs_call *call)
                call->count2    = ntohl(*bp); /* Type or next count */
 
                if (call->count > YFS_MAXENDPOINTS)
-                       return afs_protocol_error(call, -EBADMSG,
-                                                 afs_eproto_yvl_fsendpt_num);
+                       return afs_protocol_error(call, afs_eproto_yvl_fsendpt_num);
 
                alist = afs_alloc_addrlist(call->count, FS_SERVICE, AFS_FS_PORT);
                if (!alist)
@@ -469,8 +468,7 @@ static int afs_deliver_yfsvl_get_endpoints(struct afs_call *call)
                        size = sizeof(__be32) * (1 + 4 + 1);
                        break;
                default:
-                       return afs_protocol_error(call, -EBADMSG,
-                                                 afs_eproto_yvl_fsendpt_type);
+                       return afs_protocol_error(call, afs_eproto_yvl_fsendpt_type);
                }
 
                size += sizeof(__be32);
@@ -488,21 +486,20 @@ static int afs_deliver_yfsvl_get_endpoints(struct afs_call *call)
                switch (call->count2) {
                case YFS_ENDPOINT_IPV4:
                        if (ntohl(bp[0]) != sizeof(__be32) * 2)
-                               return afs_protocol_error(call, -EBADMSG,
-                                                         afs_eproto_yvl_fsendpt4_len);
+                               return afs_protocol_error(
+                                       call, afs_eproto_yvl_fsendpt4_len);
                        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 afs_protocol_error(call, -EBADMSG,
-                                                         afs_eproto_yvl_fsendpt6_len);
+                               return afs_protocol_error(
+                                       call, afs_eproto_yvl_fsendpt6_len);
                        afs_merge_fs_addr6(alist, bp + 1, ntohl(bp[5]));
                        bp += 6;
                        break;
                default:
-                       return afs_protocol_error(call, -EBADMSG,
-                                                 afs_eproto_yvl_fsendpt_type);
+                       return afs_protocol_error(call, afs_eproto_yvl_fsendpt_type);
                }
 
                /* Got either the type of the next entry or the count of
@@ -520,8 +517,7 @@ static int afs_deliver_yfsvl_get_endpoints(struct afs_call *call)
                if (!call->count)
                        goto end;
                if (call->count > YFS_MAXENDPOINTS)
-                       return afs_protocol_error(call, -EBADMSG,
-                                                 afs_eproto_yvl_vlendpt_type);
+                       return afs_protocol_error(call, afs_eproto_yvl_vlendpt_type);
 
                afs_extract_to_buf(call, 1 * sizeof(__be32));
                call->unmarshall = 3;
@@ -548,8 +544,7 @@ static int afs_deliver_yfsvl_get_endpoints(struct afs_call *call)
                        size = sizeof(__be32) * (1 + 4 + 1);
                        break;
                default:
-                       return afs_protocol_error(call, -EBADMSG,
-                                                 afs_eproto_yvl_vlendpt_type);
+                       return afs_protocol_error(call, afs_eproto_yvl_vlendpt_type);
                }
 
                if (call->count > 1)
@@ -567,19 +562,18 @@ static int afs_deliver_yfsvl_get_endpoints(struct afs_call *call)
                switch (call->count2) {
                case YFS_ENDPOINT_IPV4:
                        if (ntohl(bp[0]) != sizeof(__be32) * 2)
-                               return afs_protocol_error(call, -EBADMSG,
-                                                         afs_eproto_yvl_vlendpt4_len);
+                               return afs_protocol_error(
+                                       call, afs_eproto_yvl_vlendpt4_len);
                        bp += 3;
                        break;
                case YFS_ENDPOINT_IPV6:
                        if (ntohl(bp[0]) != sizeof(__be32) * 5)
-                               return afs_protocol_error(call, -EBADMSG,
-                                                         afs_eproto_yvl_vlendpt6_len);
+                               return afs_protocol_error(
+                                       call, afs_eproto_yvl_vlendpt6_len);
                        bp += 6;
                        break;
                default:
-                       return afs_protocol_error(call, -EBADMSG,
-                                                 afs_eproto_yvl_vlendpt_type);
+                       return afs_protocol_error(call, afs_eproto_yvl_vlendpt_type);
                }
 
                /* Got either the type of the next entry or the count of

diff --git a/fs/afs/yfsclient.c b/fs/afs/yfsclient.c
index f118daa5f33a4b1094475ba503fa34103e76b4e3..bf74c679c02bc9b11d6e118af55a2ac3cfb9a022 100644 (file)
--- a/fs/afs/yfsclient.c
+++ b/fs/afs/yfsclient.c
@@ -226,7 +226,7 @@ advance:
 
 bad:
        xdr_dump_bad(*_bp);
-       afs_protocol_error(call, -EBADMSG, afs_eproto_bad_status);
+       afs_protocol_error(call, afs_eproto_bad_status);
        goto advance;
 }
 
@@ -1426,8 +1426,7 @@ static int yfs_deliver_fs_get_volume_status(struct afs_call *call)
                call->count = ntohl(call->tmp);
                _debug("volname length: %u", call->count);
                if (call->count >= AFSNAMEMAX)
-                       return afs_protocol_error(call, -EBADMSG,
-                                                 afs_eproto_volname_len);
+                       return afs_protocol_error(call, afs_eproto_volname_len);
                size = (call->count + 3) & ~3; /* It's padded */
                afs_extract_to_buf(call, size);
                call->unmarshall++;
@@ -1456,8 +1455,7 @@ static int yfs_deliver_fs_get_volume_status(struct afs_call *call)
                call->count = ntohl(call->tmp);
                _debug("offline msg length: %u", call->count);
                if (call->count >= AFSNAMEMAX)
-                       return afs_protocol_error(call, -EBADMSG,
-                                                 afs_eproto_offline_msg_len);
+                       return afs_protocol_error(call, afs_eproto_offline_msg_len);
                size = (call->count + 3) & ~3; /* It's padded */
                afs_extract_to_buf(call, size);
                call->unmarshall++;
@@ -1487,8 +1485,7 @@ static int yfs_deliver_fs_get_volume_status(struct afs_call *call)
                call->count = ntohl(call->tmp);
                _debug("motd length: %u", call->count);
                if (call->count >= AFSNAMEMAX)
-                       return afs_protocol_error(call, -EBADMSG,
-                                                 afs_eproto_motd_len);
+                       return afs_protocol_error(call, afs_eproto_motd_len);
                size = (call->count + 3) & ~3; /* It's padded */
                afs_extract_to_buf(call, size);
                call->unmarshall++;
@@ -1797,8 +1794,7 @@ static int yfs_deliver_fs_inline_bulk_status(struct afs_call *call)
                tmp = ntohl(call->tmp);
                _debug("status count: %u/%u", tmp, call->count2);
                if (tmp != call->count2)
-                       return afs_protocol_error(call, -EBADMSG,
-                                                 afs_eproto_ibulkst_count);
+                       return afs_protocol_error(call, afs_eproto_ibulkst_count);
 
                call->count = 0;
                call->unmarshall++;
@@ -1835,8 +1831,7 @@ static int yfs_deliver_fs_inline_bulk_status(struct afs_call *call)
                tmp = ntohl(call->tmp);
                _debug("CB count: %u", tmp);
                if (tmp != call->count2)
-                       return afs_protocol_error(call, -EBADMSG,
-                                                 afs_eproto_ibulkst_cb_count);
+                       return afs_protocol_error(call, afs_eproto_ibulkst_cb_count);
                call->count = 0;
                call->unmarshall++;
        more_cbs:

diff --git a/include/trace/events/afs.h b/include/trace/events/afs.h
index 19a07fbf35df03b270f1883aa837a92f6d46a2f8..a6d8a9891164254c03de369b06644ecb5fbe0594 100644 (file)
--- a/include/trace/events/afs.h
+++ b/include/trace/events/afs.h
@@ -994,24 +994,22 @@ TRACE_EVENT(afs_edit_dir,
            );
 
 TRACE_EVENT(afs_protocol_error,
-           TP_PROTO(struct afs_call *call, int error, enum afs_eproto_cause cause),
+           TP_PROTO(struct afs_call *call, enum afs_eproto_cause cause),
 
-           TP_ARGS(call, error, cause),
+           TP_ARGS(call, cause),
 
            TP_STRUCT__entry(
                    __field(unsigned int,               call            )
-                   __field(int,                        error           )
                    __field(enum afs_eproto_cause,      cause           )
                             ),
 
            TP_fast_assign(
                    __entry->call = call ? call->debug_id : 0;
-                   __entry->error = error;
                    __entry->cause = cause;
                           ),
 
-           TP_printk("c=%08x r=%d %s",
-                     __entry->call, __entry->error,
+           TP_printk("c=%08x %s",
+                     __entry->call,
                      __print_symbolic(__entry->cause, afs_eproto_causes))
            );