Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 682513b8 authored by James Simmons's avatar James Simmons Committed by Greg Kroah-Hartman
Browse files

staging: lustre: selftest: convert srpc_service_t to proper struct 



Turn typedef srpc_service_t to proper structure

Signed-off-by: default avatarJames Simmons <uja.ornl@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 20234da5

drivers/staging/lustre/lnet/selftest/brw_test.c

+2 −1
Original line number Diff line number Diff line
@@ -497,7 +497,8 @@ void brw_init_test_client(void) 
	brw_test_client.tso_done_rpc = brw_client_done_rpc;

};



srpc_service_t brw_test_service;

struct srpc_service brw_test_service;



void brw_init_test_service(void)

{

	brw_test_service.sv_id = SRPC_SERVICE_BRW;

drivers/staging/lustre/lnet/selftest/console.c

+2 −1
Original line number Diff line number Diff line
@@ -1986,7 +1986,8 @@ lstcon_acceptor_handle(struct srpc_server_rpc *rpc) 
	return rc;

}



static srpc_service_t lstcon_acceptor_service;

static struct srpc_service lstcon_acceptor_service;



static void lstcon_init_acceptor_service(void)

{

	/* initialize selftest console acceptor service table */

drivers/staging/lustre/lnet/selftest/framework.c

+4 −4
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ sfw_find_test_case(int id) 
}



static int

sfw_register_test(srpc_service_t *service, sfw_test_client_ops_t *cliops)

sfw_register_test(struct srpc_service *service, sfw_test_client_ops_t *cliops)

{

	sfw_test_case_t *tsc;
@@ -1584,7 +1584,7 @@ sfw_post_rpc(struct srpc_client_rpc *rpc) 
	spin_unlock(&rpc->crpc_lock);

}



static srpc_service_t sfw_services[] = {

static struct srpc_service sfw_services[] = {

	{

		/* sv_id */    SRPC_SERVICE_DEBUG,

		/* sv_name */  "debug",
@@ -1628,7 +1628,7 @@ sfw_startup(void) 
	int i;

	int rc;

	int error;

	srpc_service_t *sv;

	struct srpc_service *sv;

	sfw_test_case_t *tsc;



	if (session_timeout < 0) {
@@ -1721,7 +1721,7 @@ sfw_startup(void) 
void

sfw_shutdown(void)

{

	srpc_service_t *sv;

	struct srpc_service *sv;

	sfw_test_case_t	*tsc;

	int i;

drivers/staging/lustre/lnet/selftest/ping_test.c

+2 −1
Original line number Diff line number Diff line
@@ -219,7 +219,8 @@ void ping_init_test_client(void) 
	ping_test_client.tso_done_rpc = ping_client_done_rpc;

}



srpc_service_t ping_test_service;

struct srpc_service ping_test_service;



void ping_init_test_service(void)

{

	ping_test_service.sv_id = SRPC_SERVICE_PING;

drivers/staging/lustre/lnet/selftest/rpc.c

+5 −5
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ typedef enum { 


static struct smoketest_rpc {

	spinlock_t	 rpc_glock;	/* global lock */

	srpc_service_t	*rpc_services[SRPC_SERVICE_MAX_ID + 1];

	struct srpc_service	*rpc_services[SRPC_SERVICE_MAX_ID + 1];

	lnet_handle_eq_t rpc_lnet_eq;	/* _the_ LNet event queue */

	srpc_state_t	 rpc_state;

	srpc_counters_t	 rpc_counters;
@@ -338,7 +338,7 @@ srpc_add_service(struct srpc_service *sv) 
}



int

srpc_remove_service(srpc_service_t *sv)

srpc_remove_service(struct srpc_service *sv)

{

	int id = sv->sv_id;
@@ -755,7 +755,7 @@ srpc_abort_service(struct srpc_service *sv) 
}



void

srpc_shutdown_service(srpc_service_t *sv)

srpc_shutdown_service(struct srpc_service *sv)

{

	struct srpc_service_cd *scd;

	struct srpc_server_rpc *rpc;
@@ -1414,7 +1414,7 @@ srpc_lnet_ev_handler(lnet_event_t *ev) 
	struct srpc_client_rpc *crpc;

	struct srpc_server_rpc *srpc;

	struct srpc_buffer *buffer;

	srpc_service_t *sv;

	struct srpc_service *sv;

	srpc_msg_t *msg;

	srpc_msg_type_t type;
@@ -1663,7 +1663,7 @@ srpc_shutdown(void) 
		spin_lock(&srpc_data.rpc_glock);



		for (i = 0; i <= SRPC_SERVICE_MAX_ID; i++) {

			srpc_service_t *sv = srpc_data.rpc_services[i];

			struct srpc_service *sv = srpc_data.rpc_services[i];



			LASSERTF(!sv, "service not empty: id %d, name %s\n",

				 i, sv->sv_name);