leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: lustre: lnet: change srpc_counters_t to proper structure

Browse Source 
Change srpc_counters_t from typedef to proper structure.

Signed-off-by: James 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: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Doug Oucharek <doug.s.oucharek@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
James Simmons 2017-01-16 16:30:36 -05:00 committed by Greg Kroah-Hartman
parent ba0b6953b5
commit f7a985a026
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/lustre/include/linux/lnet/lnetst.h
View File

@ -501,7 +501,7 @@ struct lst_test_ping_param {
int png_flags; /* reserved flags */ int png_flags; /* reserved flags */
}; };
typedef struct { struct srpc_counters {
__u32 errors; __u32 errors;
__u32 rpcs_sent; __u32 rpcs_sent;
__u32 rpcs_rcvd; __u32 rpcs_rcvd;
@ -509,7 +509,7 @@ typedef struct {
__u32 rpcs_expired; __u32 rpcs_expired;
__u64 bulk_get; __u64 bulk_get;
__u64 bulk_put; __u64 bulk_put;
} WIRE_ATTR srpc_counters_t; } WIRE_ATTR;
typedef struct { typedef struct {
/** milliseconds since current session started */ /** milliseconds since current session started */

4
drivers/staging/lustre/lnet/selftest/console.c
View File

@ -1468,14 +1468,14 @@ lstcon_statrpc_readent(int transop, struct srpc_msg *msg,
{ {
struct srpc_stat_reply *rep = &msg->msg_body.stat_reply; struct srpc_stat_reply *rep = &msg->msg_body.stat_reply;
sfw_counters_t __user *sfwk_stat; sfw_counters_t __user *sfwk_stat;
srpc_counters_t __user *srpc_stat; struct srpc_counters __user *srpc_stat;
lnet_counters_t __user *lnet_stat; lnet_counters_t __user *lnet_stat;
if (rep->str_status) if (rep->str_status)
return 0; return 0;
sfwk_stat = (sfw_counters_t __user *)&ent_up->rpe_payload[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); lnet_stat = (lnet_counters_t __user *)(srpc_stat + 1);
if (copy_to_user(sfwk_stat, &rep->str_fw, sizeof(*sfwk_stat)) || if (copy_to_user(sfwk_stat, &rep->str_fw, sizeof(*sfwk_stat)) ||

6
drivers/staging/lustre/lnet/selftest/rpc.c
View File

@ -55,7 +55,7 @@ static struct smoketest_rpc {
struct srpc_service *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 */ lnet_handle_eq_t rpc_lnet_eq; /* _the_ LNet event queue */
enum srpc_state rpc_state; enum srpc_state rpc_state;
srpc_counters_t rpc_counters; struct srpc_counters rpc_counters;
__u64 rpc_matchbits; /* matchbits counter */ __u64 rpc_matchbits; /* matchbits counter */
} srpc_data; } srpc_data;
@ -69,14 +69,14 @@ srpc_serv_portal(int svc_id)
/* forward ref's */ /* forward ref's */
int srpc_handle_rpc(struct swi_workitem *wi); 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); spin_lock(&srpc_data.rpc_glock);
*cnt = srpc_data.rpc_counters; *cnt = srpc_data.rpc_counters;
spin_unlock(&srpc_data.rpc_glock); 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); spin_lock(&srpc_data.rpc_glock);
srpc_data.rpc_counters = *cnt; srpc_data.rpc_counters = *cnt;

2
drivers/staging/lustre/lnet/selftest/rpc.h
View File

@ -162,7 +162,7 @@ struct srpc_stat_reply {
__u32 str_status; __u32 str_status;
struct lst_sid str_sid; struct lst_sid str_sid;
sfw_counters_t str_fw; sfw_counters_t str_fw;
srpc_counters_t str_rpc; struct srpc_counters str_rpc;
lnet_counters_t str_lnet; lnet_counters_t str_lnet;
} WIRE_ATTR; } WIRE_ATTR;

4
drivers/staging/lustre/lnet/selftest/selftest.h
View File

@ -453,8 +453,8 @@ void srpc_abort_service(struct srpc_service *sv);
int srpc_finish_service(struct srpc_service *sv); int srpc_finish_service(struct srpc_service *sv);
int srpc_service_add_buffers(struct srpc_service *sv, int nbuffer); int srpc_service_add_buffers(struct srpc_service *sv, int nbuffer);
void srpc_service_remove_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_get_counters(struct srpc_counters *cnt);
void srpc_set_counters(const srpc_counters_t *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_serial;
extern struct cfs_wi_sched **lst_sched_test; extern struct cfs_wi_sched **lst_sched_test;