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

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

staging: lustre: lnet: change sfw_counter_t to proper structure 



Change sfw_counter_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 f7a985a0

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

+2 −2
Original line number Diff line number Diff line
@@ -511,13 +511,13 @@ struct srpc_counters { 
	__u64 bulk_put;

} WIRE_ATTR;



typedef struct {

struct sfw_counters {

	/** milliseconds since current session started */

	__u32 running_ms;

	__u32 active_batches;

	__u32 zombie_sessions;

	__u32 brw_errors;

	__u32 ping_errors;

} WIRE_ATTR sfw_counters_t;

} WIRE_ATTR;



#endif

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

+2 −2
Original line number Diff line number Diff line
@@ -1467,14 +1467,14 @@ lstcon_statrpc_readent(int transop, struct srpc_msg *msg, 
		       struct lstcon_rpc_ent __user *ent_up)

{

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

	sfw_counters_t __user *sfwk_stat;

	struct sfw_counters __user *sfwk_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];

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

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

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

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

+1 −1
Original line number Diff line number Diff line
@@ -361,7 +361,7 @@ static int 
sfw_get_stats(struct srpc_stat_reqst *request, struct srpc_stat_reply *reply)

{

	struct sfw_session *sn = sfw_data.fw_session;

	sfw_counters_t *cnt = &reply->str_fw;

	struct sfw_counters *cnt = &reply->str_fw;

	struct sfw_batch *bat;



	reply->str_sid = !sn ? LST_INVALID_SID : sn->sn_id;

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

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ struct srpc_stat_reqst { 
struct srpc_stat_reply {

	__u32		   str_status;

	struct lst_sid	   str_sid;

	sfw_counters_t	   str_fw;

	struct sfw_counters	str_fw;

	struct srpc_counters	str_rpc;

	lnet_counters_t    str_lnet;

} WIRE_ATTR;