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

Commit 20234da5 authored by James Simmons's avatar James Simmons Committed by Greg Kroah-Hartman
Browse files

staging: lustre: selftest: convert srpc_client_rpc_t to proper struct 



Turn typedef srpc_client_rpc_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 25a9ca52

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

+3 −3
Original line number Diff line number Diff line
@@ -255,12 +255,12 @@ brw_check_bulk(struct srpc_bulk *bk, int pattern, __u64 magic) 


static int

brw_client_prep_rpc(sfw_test_unit_t *tsu,

		    lnet_process_id_t dest, srpc_client_rpc_t **rpcpp)

		    lnet_process_id_t dest, struct srpc_client_rpc **rpcpp)

{

	struct srpc_bulk *bulk = tsu->tsu_private;

	sfw_test_instance_t *tsi = tsu->tsu_instance;

	sfw_session_t *sn = tsi->tsi_batch->bat_session;

	srpc_client_rpc_t *rpc;

	struct srpc_client_rpc *rpc;

	srpc_brw_reqst_t *req;

	int flags;

	int npg;
@@ -313,7 +313,7 @@ brw_client_prep_rpc(sfw_test_unit_t *tsu, 
}



static void

brw_client_done_rpc(sfw_test_unit_t *tsu, srpc_client_rpc_t *rpc)

brw_client_done_rpc(sfw_test_unit_t *tsu, struct srpc_client_rpc *rpc)

{

	__u64 magic = BRW_MAGIC;

	sfw_test_instance_t *tsi = tsu->tsu_instance;

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

+4 −4
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ void lstcon_rpc_stat_reply(lstcon_rpc_trans_t *, srpc_msg_t *, 
			   lstcon_node_t *, lstcon_trans_stat_t *);



static void

lstcon_rpc_done(srpc_client_rpc_t *rpc)

lstcon_rpc_done(struct srpc_client_rpc *rpc)

{

	lstcon_rpc_t *crpc = (lstcon_rpc_t *)rpc->crpc_priv;
@@ -287,7 +287,7 @@ lstcon_rpc_trans_addreq(lstcon_rpc_trans_t *trans, lstcon_rpc_t *crpc) 
void

lstcon_rpc_trans_abort(lstcon_rpc_trans_t *trans, int error)

{

	srpc_client_rpc_t *rpc;

	struct srpc_client_rpc *rpc;

	lstcon_rpc_t *crpc;

	lstcon_node_t *nd;
@@ -389,7 +389,7 @@ static int 
lstcon_rpc_get_reply(lstcon_rpc_t *crpc, srpc_msg_t **msgpp)

{

	lstcon_node_t *nd = crpc->crp_node;

	srpc_client_rpc_t *rpc = crpc->crp_rpc;

	struct srpc_client_rpc *rpc = crpc->crp_rpc;

	srpc_generic_reply_t *rep;



	LASSERT(nd && rpc);
@@ -541,7 +541,7 @@ lstcon_rpc_trans_interpreter(lstcon_rpc_trans_t *trans, 
void

lstcon_rpc_trans_destroy(lstcon_rpc_trans_t *trans)

{

	srpc_client_rpc_t *rpc;

	struct srpc_client_rpc *rpc;

	lstcon_rpc_t *crpc;

	lstcon_rpc_t *tmp;

	int count = 0;

drivers/staging/lustre/lnet/selftest/conrpc.h

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ struct lstcon_node; 


typedef struct lstcon_rpc {

	struct list_head	 crp_link;	/* chain on rpc transaction */

	srpc_client_rpc_t	*crp_rpc;	/* client rpc */

	struct srpc_client_rpc	*crp_rpc;	/* client rpc */

	struct lstcon_node	*crp_node;	/* destination node */

	struct lstcon_rpc_trans *crp_trans;	/* conrpc transaction */

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

+18 −18
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ sfw_server_rpc_done(struct srpc_server_rpc *rpc) 
}



static void

sfw_client_rpc_fini(srpc_client_rpc_t *rpc)

sfw_client_rpc_fini(struct srpc_client_rpc *rpc)

{

	LASSERT(!rpc->crpc_bulk.bk_niov);

	LASSERT(list_empty(&rpc->crpc_list));
@@ -526,7 +526,7 @@ sfw_debug_session(srpc_debug_reqst_t *request, srpc_debug_reply_t *reply) 
}



static void

sfw_test_rpc_fini(srpc_client_rpc_t *rpc)

sfw_test_rpc_fini(struct srpc_client_rpc *rpc)

{

	sfw_test_unit_t *tsu = rpc->crpc_priv;

	sfw_test_instance_t *tsi = tsu->tsu_instance;
@@ -616,7 +616,7 @@ sfw_unload_test(struct sfw_test_instance *tsi) 
static void

sfw_destroy_test_instance(sfw_test_instance_t *tsi)

{

	srpc_client_rpc_t *rpc;

	struct srpc_client_rpc *rpc;

	sfw_test_unit_t *tsu;



	if (!tsi->tsi_is_client)
@@ -637,7 +637,7 @@ sfw_destroy_test_instance(sfw_test_instance_t *tsi) 


	while (!list_empty(&tsi->tsi_free_rpcs)) {

		rpc = list_entry(tsi->tsi_free_rpcs.next,

				 srpc_client_rpc_t, crpc_list);

				 struct srpc_client_rpc, crpc_list);

		list_del(&rpc->crpc_list);

		LIBCFS_FREE(rpc, srpc_client_rpc_size(rpc));

	}
@@ -866,7 +866,7 @@ sfw_test_unit_done(sfw_test_unit_t *tsu) 
}



static void

sfw_test_rpc_done(srpc_client_rpc_t *rpc)

sfw_test_rpc_done(struct srpc_client_rpc *rpc)

{

	sfw_test_unit_t *tsu = rpc->crpc_priv;

	sfw_test_instance_t *tsi = tsu->tsu_instance;
@@ -902,9 +902,9 @@ sfw_test_rpc_done(srpc_client_rpc_t *rpc) 
int

sfw_create_test_rpc(sfw_test_unit_t *tsu, lnet_process_id_t peer,

		    unsigned features, int nblk, int blklen,

		    srpc_client_rpc_t **rpcpp)

		    struct srpc_client_rpc **rpcpp)

{

	srpc_client_rpc_t *rpc = NULL;

	struct srpc_client_rpc *rpc = NULL;

	sfw_test_instance_t *tsi = tsu->tsu_instance;



	spin_lock(&tsi->tsi_lock);
@@ -912,7 +912,7 @@ sfw_create_test_rpc(sfw_test_unit_t *tsu, lnet_process_id_t peer, 
	LASSERT(sfw_test_active(tsi));

		/* pick request from buffer */

	rpc = list_first_entry_or_null(&tsi->tsi_free_rpcs,

				       srpc_client_rpc_t, crpc_list);

				       struct srpc_client_rpc, crpc_list);

	if (rpc) {

		LASSERT(nblk == rpc->crpc_bulk.bk_niov);

		list_del_init(&rpc->crpc_list);
@@ -946,7 +946,7 @@ sfw_run_test(struct swi_workitem *wi) 
{

	sfw_test_unit_t *tsu = wi->swi_workitem.wi_data;

	sfw_test_instance_t *tsi = tsu->tsu_instance;

	srpc_client_rpc_t *rpc = NULL;

	struct srpc_client_rpc *rpc = NULL;



	LASSERT(wi == &tsu->tsu_worker);
@@ -1029,7 +1029,7 @@ int 
sfw_stop_batch(sfw_batch_t *tsb, int force)

{

	sfw_test_instance_t *tsi;

	srpc_client_rpc_t *rpc;

	struct srpc_client_rpc *rpc;



	if (!sfw_batch_active(tsb)) {

		CDEBUG(D_NET, "Batch %llu inactive\n", tsb->bat_id.bat_id);
@@ -1377,12 +1377,12 @@ sfw_bulk_ready(struct srpc_server_rpc *rpc, int status) 
	return rc;

}



srpc_client_rpc_t *

struct srpc_client_rpc *

sfw_create_rpc(lnet_process_id_t peer, int service,

	       unsigned features, int nbulkiov, int bulklen,

	       void (*done)(srpc_client_rpc_t *), void *priv)

	       void (*done)(struct srpc_client_rpc *), void *priv)

{

	srpc_client_rpc_t *rpc = NULL;

	struct srpc_client_rpc *rpc = NULL;



	spin_lock(&sfw_data.fw_lock);
@@ -1391,7 +1391,7 @@ sfw_create_rpc(lnet_process_id_t peer, int service, 


	if (!nbulkiov && !list_empty(&sfw_data.fw_zombie_rpcs)) {

		rpc = list_entry(sfw_data.fw_zombie_rpcs.next,

				 srpc_client_rpc_t, crpc_list);

				 struct srpc_client_rpc, crpc_list);

		list_del(&rpc->crpc_list);



		srpc_init_client_rpc(rpc, peer, service, 0, 0,
@@ -1558,7 +1558,7 @@ sfw_unpack_message(srpc_msg_t *msg) 
}



void

sfw_abort_rpc(srpc_client_rpc_t *rpc)

sfw_abort_rpc(struct srpc_client_rpc *rpc)

{

	LASSERT(atomic_read(&rpc->crpc_refcount) > 0);

	LASSERT(rpc->crpc_service <= SRPC_FRAMEWORK_SERVICE_MAX_ID);
@@ -1569,7 +1569,7 @@ sfw_abort_rpc(srpc_client_rpc_t *rpc) 
}



void

sfw_post_rpc(srpc_client_rpc_t *rpc)

sfw_post_rpc(struct srpc_client_rpc *rpc)

{

	spin_lock(&rpc->crpc_lock);
@@ -1759,10 +1759,10 @@ sfw_shutdown(void) 
	}



	while (!list_empty(&sfw_data.fw_zombie_rpcs)) {

		srpc_client_rpc_t *rpc;

		struct srpc_client_rpc *rpc;



		rpc = list_entry(sfw_data.fw_zombie_rpcs.next,

				 srpc_client_rpc_t, crpc_list);

				 struct srpc_client_rpc, crpc_list);

		list_del(&rpc->crpc_list);



		LIBCFS_FREE(rpc, srpc_client_rpc_size(rpc));

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

+2 −2
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ ping_client_fini(sfw_test_instance_t *tsi) 


static int

ping_client_prep_rpc(sfw_test_unit_t *tsu, lnet_process_id_t dest,

		     srpc_client_rpc_t **rpc)

		     struct srpc_client_rpc **rpc)

{

	srpc_ping_reqst_t *req;

	sfw_test_instance_t *tsi = tsu->tsu_instance;
@@ -118,7 +118,7 @@ ping_client_prep_rpc(sfw_test_unit_t *tsu, lnet_process_id_t dest, 
}



static void

ping_client_done_rpc(sfw_test_unit_t *tsu, srpc_client_rpc_t *rpc)

ping_client_done_rpc(sfw_test_unit_t *tsu, struct srpc_client_rpc *rpc)

{

	sfw_test_instance_t *tsi = tsu->tsu_instance;

	sfw_session_t *sn = tsi->tsi_batch->bat_session;