Commit b31e64c4 authored by James Simmons's avatar James Simmons Committed by Greg Kroah-Hartman

staging: lustre: remove space in LNet function declarations

Several function declarations have spacing in them. Lets
remove all those instances reported by checkpatch.pl.
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d3d3d37a
...@@ -967,7 +967,7 @@ void kiblnd_queue_tx(kib_tx_t *tx, kib_conn_t *conn); ...@@ -967,7 +967,7 @@ void kiblnd_queue_tx(kib_tx_t *tx, kib_conn_t *conn);
void kiblnd_init_tx_msg(lnet_ni_t *ni, kib_tx_t *tx, int type, int body_nob); void kiblnd_init_tx_msg(lnet_ni_t *ni, kib_tx_t *tx, int type, int body_nob);
void kiblnd_txlist_done(lnet_ni_t *ni, struct list_head *txlist, void kiblnd_txlist_done(lnet_ni_t *ni, struct list_head *txlist,
int status); int status);
void kiblnd_check_sends (kib_conn_t *conn); void kiblnd_check_sends(kib_conn_t *conn);
void kiblnd_qp_event(struct ib_event *event, void *arg); void kiblnd_qp_event(struct ib_event *event, void *arg);
void kiblnd_cq_event(struct ib_event *event, void *arg); void kiblnd_cq_event(struct ib_event *event, void *arg);
......
...@@ -472,9 +472,9 @@ ksocknal_send_hello_v1(ksock_conn_t *conn, ksock_hello_msg_t *hello) ...@@ -472,9 +472,9 @@ ksocknal_send_hello_v1(ksock_conn_t *conn, ksock_hello_msg_t *hello)
* Re-organize V2.x message header to V1.x (lnet_hdr_t) * Re-organize V2.x message header to V1.x (lnet_hdr_t)
* header and send out * header and send out
*/ */
hmv->magic = cpu_to_le32 (LNET_PROTO_TCP_MAGIC); hmv->magic = cpu_to_le32(LNET_PROTO_TCP_MAGIC);
hmv->version_major = cpu_to_le16 (KSOCK_PROTO_V1_MAJOR); hmv->version_major = cpu_to_le16(KSOCK_PROTO_V1_MAJOR);
hmv->version_minor = cpu_to_le16 (KSOCK_PROTO_V1_MINOR); hmv->version_minor = cpu_to_le16(KSOCK_PROTO_V1_MINOR);
if (the_lnet.ln_testprotocompat != 0) { if (the_lnet.ln_testprotocompat != 0) {
/* single-shot proto check */ /* single-shot proto check */
...@@ -490,12 +490,12 @@ ksocknal_send_hello_v1(ksock_conn_t *conn, ksock_hello_msg_t *hello) ...@@ -490,12 +490,12 @@ ksocknal_send_hello_v1(ksock_conn_t *conn, ksock_hello_msg_t *hello)
LNET_UNLOCK(); LNET_UNLOCK();
} }
hdr->src_nid = cpu_to_le64 (hello->kshm_src_nid); hdr->src_nid = cpu_to_le64(hello->kshm_src_nid);
hdr->src_pid = cpu_to_le32 (hello->kshm_src_pid); hdr->src_pid = cpu_to_le32(hello->kshm_src_pid);
hdr->type = cpu_to_le32 (LNET_MSG_HELLO); hdr->type = cpu_to_le32(LNET_MSG_HELLO);
hdr->payload_length = cpu_to_le32 (hello->kshm_nips * sizeof(__u32)); hdr->payload_length = cpu_to_le32(hello->kshm_nips * sizeof(__u32));
hdr->msg.hello.type = cpu_to_le32 (hello->kshm_ctype); hdr->msg.hello.type = cpu_to_le32(hello->kshm_ctype);
hdr->msg.hello.incarnation = cpu_to_le64 (hello->kshm_src_incarnation); hdr->msg.hello.incarnation = cpu_to_le64(hello->kshm_src_incarnation);
rc = lnet_sock_write(sock, hdr, sizeof(*hdr), lnet_acceptor_timeout()); rc = lnet_sock_write(sock, hdr, sizeof(*hdr), lnet_acceptor_timeout());
if (rc != 0) { if (rc != 0) {
...@@ -508,7 +508,7 @@ ksocknal_send_hello_v1(ksock_conn_t *conn, ksock_hello_msg_t *hello) ...@@ -508,7 +508,7 @@ ksocknal_send_hello_v1(ksock_conn_t *conn, ksock_hello_msg_t *hello)
goto out; goto out;
for (i = 0; i < (int) hello->kshm_nips; i++) { for (i = 0; i < (int) hello->kshm_nips; i++) {
hello->kshm_ips[i] = __cpu_to_le32 (hello->kshm_ips[i]); hello->kshm_ips[i] = __cpu_to_le32(hello->kshm_ips[i]);
} }
rc = lnet_sock_write(sock, hello->kshm_ips, rc = lnet_sock_write(sock, hello->kshm_ips,
...@@ -593,7 +593,7 @@ ksocknal_recv_hello_v1(ksock_conn_t *conn, ksock_hello_msg_t *hello, ...@@ -593,7 +593,7 @@ ksocknal_recv_hello_v1(ksock_conn_t *conn, ksock_hello_msg_t *hello,
} }
/* ...and check we got what we expected */ /* ...and check we got what we expected */
if (hdr->type != cpu_to_le32 (LNET_MSG_HELLO)) { if (hdr->type != cpu_to_le32(LNET_MSG_HELLO)) {
CERROR("Expecting a HELLO hdr, but got type %d from %pI4h\n", CERROR("Expecting a HELLO hdr, but got type %d from %pI4h\n",
le32_to_cpu(hdr->type), le32_to_cpu(hdr->type),
&conn->ksnc_ipaddr); &conn->ksnc_ipaddr);
......
...@@ -176,7 +176,7 @@ lstcon_trans_stat(void) ...@@ -176,7 +176,7 @@ lstcon_trans_stat(void)
} }
static inline struct list_head * static inline struct list_head *
lstcon_id2hash (lnet_process_id_t id, struct list_head *hash) lstcon_id2hash(lnet_process_id_t id, struct list_head *hash)
{ {
unsigned int idx = LNET_NIDADDR(id.nid) % LST_NODE_HASHSIZE; unsigned int idx = LNET_NIDADDR(id.nid) % LST_NODE_HASHSIZE;
......
...@@ -94,11 +94,11 @@ struct sfw_test_instance; ...@@ -94,11 +94,11 @@ struct sfw_test_instance;
#define SRPC_RDMA_PORTAL 52 #define SRPC_RDMA_PORTAL 52
static inline srpc_msg_type_t static inline srpc_msg_type_t
srpc_service2request (int service) srpc_service2request(int service)
{ {
switch (service) { switch (service) {
default: default:
LBUG (); LBUG();
case SRPC_SERVICE_DEBUG: case SRPC_SERVICE_DEBUG:
return SRPC_MSG_DEBUG_REQST; return SRPC_MSG_DEBUG_REQST;
...@@ -129,7 +129,7 @@ srpc_service2request (int service) ...@@ -129,7 +129,7 @@ srpc_service2request (int service)
} }
static inline srpc_msg_type_t static inline srpc_msg_type_t
srpc_service2reply (int service) srpc_service2reply(int service)
{ {
return srpc_service2request(service) + 1; return srpc_service2request(service) + 1;
} }
...@@ -427,7 +427,7 @@ void sfw_free_pages(struct srpc_server_rpc *rpc); ...@@ -427,7 +427,7 @@ void sfw_free_pages(struct srpc_server_rpc *rpc);
void sfw_add_bulk_page(srpc_bulk_t *bk, struct page *pg, int i); void sfw_add_bulk_page(srpc_bulk_t *bk, struct page *pg, int i);
int sfw_alloc_pages(struct srpc_server_rpc *rpc, int cpt, int npages, int len, int sfw_alloc_pages(struct srpc_server_rpc *rpc, int cpt, int npages, int len,
int sink); int sink);
int sfw_make_session (srpc_mksn_reqst_t *request, srpc_mksn_reply_t *reply); int sfw_make_session(srpc_mksn_reqst_t *request, srpc_mksn_reply_t *reply);
srpc_client_rpc_t * srpc_client_rpc_t *
srpc_create_client_rpc(lnet_process_id_t peer, int service, srpc_create_client_rpc(lnet_process_id_t peer, int service,
...@@ -502,7 +502,7 @@ void sfw_shutdown(void); ...@@ -502,7 +502,7 @@ void sfw_shutdown(void);
void srpc_shutdown(void); void srpc_shutdown(void);
static inline void static inline void
srpc_destroy_client_rpc (srpc_client_rpc_t *rpc) srpc_destroy_client_rpc(srpc_client_rpc_t *rpc)
{ {
LASSERT(rpc != NULL); LASSERT(rpc != NULL);
LASSERT(!srpc_event_pending(rpc)); LASSERT(!srpc_event_pending(rpc));
...@@ -518,10 +518,10 @@ srpc_destroy_client_rpc (srpc_client_rpc_t *rpc) ...@@ -518,10 +518,10 @@ srpc_destroy_client_rpc (srpc_client_rpc_t *rpc)
} }
static inline void static inline void
srpc_init_client_rpc (srpc_client_rpc_t *rpc, lnet_process_id_t peer, srpc_init_client_rpc(srpc_client_rpc_t *rpc, lnet_process_id_t peer,
int service, int nbulkiov, int bulklen, int service, int nbulkiov, int bulklen,
void (*rpc_done)(srpc_client_rpc_t *), void (*rpc_done)(srpc_client_rpc_t *),
void (*rpc_fini)(srpc_client_rpc_t *), void *priv) void (*rpc_fini)(srpc_client_rpc_t *), void *priv)
{ {
LASSERT(nbulkiov <= LNET_MAX_IOV); LASSERT(nbulkiov <= LNET_MAX_IOV);
...@@ -557,7 +557,7 @@ srpc_init_client_rpc (srpc_client_rpc_t *rpc, lnet_process_id_t peer, ...@@ -557,7 +557,7 @@ srpc_init_client_rpc (srpc_client_rpc_t *rpc, lnet_process_id_t peer,
} }
static inline const char * static inline const char *
swi_state2str (int state) swi_state2str(int state)
{ {
#define STATE2STR(x) case x: return #x #define STATE2STR(x) case x: return #x
switch (state) { switch (state) {
...@@ -604,9 +604,9 @@ srpc_wait_service_shutdown(srpc_service_t *sv) ...@@ -604,9 +604,9 @@ srpc_wait_service_shutdown(srpc_service_t *sv)
while (srpc_finish_service(sv) == 0) { while (srpc_finish_service(sv) == 0) {
i++; i++;
CDEBUG (((i & -i) == i) ? D_WARNING : D_NET, CDEBUG(((i & -i) == i) ? D_WARNING : D_NET,
"Waiting for %s service to shutdown...\n", "Waiting for %s service to shutdown...\n",
sv->sv_name); sv->sv_name);
selftest_wait_events(); selftest_wait_events();
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment