From 50ae3e67e4f294925fc840d3f83b77f7072af54d Mon Sep 17 00:00:00 2001 From: Kaleb S KEITHLEY Date: Wed, 18 Nov 2015 12:28:42 -0500 Subject: all: reduce "inline" usage There are three kinds of inline functions: plain inline, extern inline, and static inline. All three have been removed from .c files, except those in "contrib" which aren't our problem. Inlines in .h files, which are overwhelmingly "static inline" already, have generally been left alone. Over time we should be able to "lower" these into .c files, but that has to be done in a case-by-case fashion requiring more manual effort. This part was easy to do automatically without (as far as I can tell) any ill effect. In the process, several pieces of dead code were flagged by the compiler, and were removed. backport of Change-Id: I56a5e614735c9e0a6ee420dab949eac22e25c155, http://review.gluster.org/11769, BUG: 1245331 Change-Id: Iba1efb0bc578ea4a5e9bf76b7bd93dc1be9eba44 BUG: 1283302 Signed-off-by: Kaleb S KEITHLEY Reviewed-on: http://review.gluster.org/12646 Smoke: Gluster Build System NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Reviewed-by: Niels de Vos --- rpc/rpc-transport/rdma/src/rdma.c | 10 +++++----- rpc/rpc-transport/socket/src/socket.c | 24 ++++++++++++------------ 2 files changed, 17 insertions(+), 17 deletions(-) (limited to 'rpc/rpc-transport') diff --git a/rpc/rpc-transport/rdma/src/rdma.c b/rpc/rpc-transport/rdma/src/rdma.c index 25eef7b97ee..34972deef09 100644 --- a/rpc/rpc-transport/rdma/src/rdma.c +++ b/rpc/rpc-transport/rdma/src/rdma.c @@ -1733,7 +1733,7 @@ out: } -static inline void +static void __gf_rdma_deregister_mr (gf_rdma_device_t *device, struct ibv_mr **mr, int count) { @@ -2135,7 +2135,7 @@ out: } -static inline void +static void __gf_rdma_fill_reply_header (gf_rdma_header_t *header, struct iovec *rpchdr, gf_rdma_reply_info_t *reply_info, int credits) { @@ -2286,7 +2286,7 @@ out: } -static inline int32_t +static int32_t __gf_rdma_register_local_mr_for_rdma (gf_rdma_peer_t *peer, struct iovec *vector, int count, gf_rdma_post_context_t *ctx) @@ -3382,7 +3382,7 @@ out: } -static inline int32_t +static int32_t gf_rdma_decode_error_msg (gf_rdma_peer_t *peer, gf_rdma_post_t *post, size_t bytes_in_post) { @@ -3957,7 +3957,7 @@ out: } -static inline int32_t +static int32_t gf_rdma_recv_request (gf_rdma_peer_t *peer, gf_rdma_post_t *post, gf_rdma_read_chunk_t *readch) { diff --git a/rpc/rpc-transport/socket/src/socket.c b/rpc/rpc-transport/socket/src/socket.c index c5ab22f9941..b3a80d9ceb1 100644 --- a/rpc/rpc-transport/socket/src/socket.c +++ b/rpc/rpc-transport/socket/src/socket.c @@ -1186,7 +1186,7 @@ out: } -static inline int +static int __socket_read_simple_msg (rpc_transport_t *this) { int ret = 0; @@ -1255,7 +1255,7 @@ out: } -static inline int +static int __socket_read_simple_request (rpc_transport_t *this) { return __socket_read_simple_msg (this); @@ -1272,7 +1272,7 @@ __socket_read_simple_request (rpc_transport_t *this) #define rpc_progver_addr(buf) (buf + RPC_MSGTYPE_SIZE + 8) #define rpc_procnum_addr(buf) (buf + RPC_MSGTYPE_SIZE + 12) -static inline int +static int __socket_read_vectored_request (rpc_transport_t *this, rpcsvc_vector_sizer vector_sizer) { socket_private_t *priv = NULL; @@ -1444,7 +1444,7 @@ out: return ret; } -static inline int +static int __socket_read_request (rpc_transport_t *this) { socket_private_t *priv = NULL; @@ -1525,7 +1525,7 @@ out: } -static inline int +static int __socket_read_accepted_successful_reply (rpc_transport_t *this) { socket_private_t *priv = NULL; @@ -1652,7 +1652,7 @@ out: #define rpc_reply_verflen_addr(fragcurrent) ((char *)fragcurrent - 4) #define rpc_reply_accept_status_addr(fragcurrent) ((char *)fragcurrent - 4) -static inline int +static int __socket_read_accepted_reply (rpc_transport_t *this) { socket_private_t *priv = NULL; @@ -1748,7 +1748,7 @@ out: } -static inline int +static int __socket_read_denied_reply (rpc_transport_t *this) { return __socket_read_simple_msg (this); @@ -1758,7 +1758,7 @@ __socket_read_denied_reply (rpc_transport_t *this) #define rpc_reply_status_addr(fragcurrent) ((char *)fragcurrent - 4) -static inline int +static int __socket_read_vectored_reply (rpc_transport_t *this) { socket_private_t *priv = NULL; @@ -1824,7 +1824,7 @@ out: } -static inline int +static int __socket_read_simple_reply (rpc_transport_t *this) { return __socket_read_simple_msg (this); @@ -1832,7 +1832,7 @@ __socket_read_simple_reply (rpc_transport_t *this) #define rpc_xid_addr(buf) (buf) -static inline int +static int __socket_read_reply (rpc_transport_t *this) { socket_private_t *priv = NULL; @@ -1907,7 +1907,7 @@ out: /* returns the number of bytes yet to be read in a fragment */ -static inline int +static int __socket_read_frag (rpc_transport_t *this) { socket_private_t *priv = NULL; @@ -1984,7 +1984,7 @@ out: } -static inline void +static void __socket_reset_priv (socket_private_t *priv) { struct gf_sock_incoming *in = NULL; -- cgit