diff options
Diffstat (limited to 'rpc')
| -rw-r--r-- | rpc/rpc-lib/src/rpc-clnt.c | 4 | ||||
| -rw-r--r-- | rpc/rpc-lib/src/rpc-transport.c | 2 | ||||
| -rw-r--r-- | rpc/rpc-lib/src/rpcsvc.c | 14 | ||||
| -rw-r--r-- | rpc/rpc-transport/rdma/src/rdma.c | 10 | ||||
| -rw-r--r-- | rpc/rpc-transport/socket/src/socket.c | 24 |
5 files changed, 27 insertions, 27 deletions
diff --git a/rpc/rpc-lib/src/rpc-clnt.c b/rpc/rpc-lib/src/rpc-clnt.c index 11d6cedfe07..be1c5637aad 100644 --- a/rpc/rpc-lib/src/rpc-clnt.c +++ b/rpc/rpc-lib/src/rpc-clnt.c @@ -772,7 +772,7 @@ out: } -inline void +void rpc_clnt_set_connected (rpc_clnt_connection_t *conn) { if (!conn) { @@ -955,7 +955,7 @@ rpc_clnt_connection_deinit (rpc_clnt_connection_t *conn) } -static inline int +static int rpc_clnt_connection_init (struct rpc_clnt *clnt, glusterfs_ctx_t *ctx, dict_t *options, char *name) { diff --git a/rpc/rpc-lib/src/rpc-transport.c b/rpc/rpc-lib/src/rpc-transport.c index 4ade6b7d0b3..197c1682027 100644 --- a/rpc/rpc-lib/src/rpc-transport.c +++ b/rpc/rpc-lib/src/rpc-transport.c @@ -546,7 +546,7 @@ out: -inline int +int rpc_transport_register_notify (rpc_transport_t *trans, rpc_transport_notify_t notify, void *mydata) { diff --git a/rpc/rpc-lib/src/rpcsvc.c b/rpc/rpc-lib/src/rpcsvc.c index 2404a48bce7..6955d1ad328 100644 --- a/rpc/rpc-lib/src/rpcsvc.c +++ b/rpc/rpc-lib/src/rpcsvc.c @@ -320,7 +320,7 @@ err: /* this procedure can only pass 4 arguments to registered notifyfn. To send more * arguments call wrapper->notify directly. */ -static inline void +static void rpcsvc_program_notify (rpcsvc_listener_t *listener, rpcsvc_event_t event, void *data) { @@ -343,7 +343,7 @@ out: } -static inline int +static int rpcsvc_accept (rpcsvc_t *svc, rpc_transport_t *listen_trans, rpc_transport_t *new_trans) { @@ -1350,7 +1350,7 @@ rpcsvc_error_reply (rpcsvc_request_t *req) /* Register the program with the local portmapper service. */ -inline int +int rpcsvc_program_register_portmap (rpcsvc_program_t *newprog, uint32_t port) { int ret = -1; /* FAIL */ @@ -1373,7 +1373,7 @@ out: } -inline int +int rpcsvc_program_unregister_portmap (rpcsvc_program_t *prog) { int ret = -1; @@ -1557,7 +1557,7 @@ out: } -inline int +int rpcsvc_transport_peername (rpc_transport_t *trans, char *hostname, int hostlen) { if (!trans) { @@ -1568,7 +1568,7 @@ rpcsvc_transport_peername (rpc_transport_t *trans, char *hostname, int hostlen) } -inline int +int rpcsvc_transport_peeraddr (rpc_transport_t *trans, char *addrstr, int addrlen, struct sockaddr_storage *sa, socklen_t sasize) { @@ -1817,7 +1817,7 @@ out: } -inline int +int rpcsvc_program_register (rpcsvc_t *svc, rpcsvc_program_t *program) { int ret = -1; diff --git a/rpc/rpc-transport/rdma/src/rdma.c b/rpc/rpc-transport/rdma/src/rdma.c index fe63d246adb..1f397e42206 100644 --- a/rpc/rpc-transport/rdma/src/rdma.c +++ b/rpc/rpc-transport/rdma/src/rdma.c @@ -1730,7 +1730,7 @@ out: } -static inline void +static void __gf_rdma_deregister_mr (gf_rdma_device_t *device, struct ibv_mr **mr, int count) { @@ -2132,7 +2132,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) { @@ -2283,7 +2283,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) @@ -3379,7 +3379,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) { @@ -3954,7 +3954,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 b0b1b99db10..e57bea4a749 100644 --- a/rpc/rpc-transport/socket/src/socket.c +++ b/rpc/rpc-transport/socket/src/socket.c @@ -1181,7 +1181,7 @@ out: } -static inline int +static int __socket_read_simple_msg (rpc_transport_t *this) { int ret = 0; @@ -1250,7 +1250,7 @@ out: } -static inline int +static int __socket_read_simple_request (rpc_transport_t *this) { return __socket_read_simple_msg (this); @@ -1267,7 +1267,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; @@ -1439,7 +1439,7 @@ out: return ret; } -static inline int +static int __socket_read_request (rpc_transport_t *this) { socket_private_t *priv = NULL; @@ -1520,7 +1520,7 @@ out: } -static inline int +static int __socket_read_accepted_successful_reply (rpc_transport_t *this) { socket_private_t *priv = NULL; @@ -1647,7 +1647,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; @@ -1743,7 +1743,7 @@ out: } -static inline int +static int __socket_read_denied_reply (rpc_transport_t *this) { return __socket_read_simple_msg (this); @@ -1753,7 +1753,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; @@ -1819,7 +1819,7 @@ out: } -static inline int +static int __socket_read_simple_reply (rpc_transport_t *this) { return __socket_read_simple_msg (this); @@ -1827,7 +1827,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; @@ -1902,7 +1902,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; @@ -1979,7 +1979,7 @@ out: } -static inline void +static void __socket_reset_priv (socket_private_t *priv) { struct gf_sock_incoming *in = NULL; |