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

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

staging: lustre: lnet: change srpc_counters_t to proper structure 



Change srpc_counters_t from typedef to proper structure.

Signed-off-by: default avatarJames Simmons <uja.ornl@yahoo.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6142
Reviewed-on: https://review.whamcloud.com/24188


Reviewed-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Reviewed-by: default avatarDoug Oucharek <doug.s.oucharek@intel.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ba0b6953

drivers/staging/lustre/include/linux/lnet/lnetst.h

+2 −2
Original line number Diff line number Diff line
@@ -501,7 +501,7 @@ struct lst_test_ping_param { 
	int	png_flags;	/* reserved flags */

};



typedef struct {

struct srpc_counters {

	__u32 errors;

	__u32 rpcs_sent;

	__u32 rpcs_rcvd;
@@ -509,7 +509,7 @@ typedef struct { 
	__u32 rpcs_expired;

	__u64 bulk_get;

	__u64 bulk_put;

} WIRE_ATTR srpc_counters_t;

} WIRE_ATTR;



typedef struct {

	/** milliseconds since current session started */

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

+2 −2
Original line number Diff line number Diff line
@@ -1468,14 +1468,14 @@ lstcon_statrpc_readent(int transop, struct srpc_msg *msg, 
{

	struct srpc_stat_reply *rep = &msg->msg_body.stat_reply;

	sfw_counters_t __user *sfwk_stat;

	srpc_counters_t __user *srpc_stat;

	struct srpc_counters __user *srpc_stat;

	lnet_counters_t __user *lnet_stat;



	if (rep->str_status)

		return 0;



	sfwk_stat = (sfw_counters_t __user *)&ent_up->rpe_payload[0];

	srpc_stat = (srpc_counters_t __user *)(sfwk_stat + 1);

	srpc_stat = (struct srpc_counters __user *)(sfwk_stat + 1);

	lnet_stat = (lnet_counters_t __user *)(srpc_stat + 1);



	if (copy_to_user(sfwk_stat, &rep->str_fw, sizeof(*sfwk_stat)) ||

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

+3 −3
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ static struct smoketest_rpc { 
	struct srpc_service	*rpc_services[SRPC_SERVICE_MAX_ID + 1];

	lnet_handle_eq_t rpc_lnet_eq;	/* _the_ LNet event queue */

	enum srpc_state	 rpc_state;

	srpc_counters_t	 rpc_counters;

	struct srpc_counters	 rpc_counters;

	__u64		 rpc_matchbits;	/* matchbits counter */

} srpc_data;
@@ -69,14 +69,14 @@ srpc_serv_portal(int svc_id) 
/* forward ref's */

int srpc_handle_rpc(struct swi_workitem *wi);



void srpc_get_counters(srpc_counters_t *cnt)

void srpc_get_counters(struct srpc_counters *cnt)

{

	spin_lock(&srpc_data.rpc_glock);

	*cnt = srpc_data.rpc_counters;

	spin_unlock(&srpc_data.rpc_glock);

}



void srpc_set_counters(const srpc_counters_t *cnt)

void srpc_set_counters(const struct srpc_counters *cnt)

{

	spin_lock(&srpc_data.rpc_glock);

	srpc_data.rpc_counters = *cnt;

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

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ struct srpc_stat_reply { 
	__u32		   str_status;

	struct lst_sid	   str_sid;

	sfw_counters_t	   str_fw;

	srpc_counters_t    str_rpc;

	struct srpc_counters	str_rpc;

	lnet_counters_t    str_lnet;

} WIRE_ATTR;

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

+2 −2
Original line number Diff line number Diff line
@@ -453,8 +453,8 @@ void srpc_abort_service(struct srpc_service *sv); 
int srpc_finish_service(struct srpc_service *sv);

int srpc_service_add_buffers(struct srpc_service *sv, int nbuffer);

void srpc_service_remove_buffers(struct srpc_service *sv, int nbuffer);

void srpc_get_counters(srpc_counters_t *cnt);

void srpc_set_counters(const srpc_counters_t *cnt);

void srpc_get_counters(struct srpc_counters *cnt);

void srpc_set_counters(const struct srpc_counters *cnt);



extern struct cfs_wi_sched *lst_sched_serial;

extern struct cfs_wi_sched **lst_sched_test;