Commit 081cb7db authored by Craig Inches's avatar Craig Inches Committed by Greg Kroah-Hartman

Staging: Lustre Fixing multiline block comments in lnetst.h

This fixes multiple block statements found not to match
style as per checkpatch
Signed-off-by: default avatarCraig Inches <Craig@craiginches.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e0663483
...@@ -54,7 +54,8 @@ ...@@ -54,7 +54,8 @@
#define LSTIO_GROUP_ADD 0xC10 /* add group */ #define LSTIO_GROUP_ADD 0xC10 /* add group */
#define LSTIO_GROUP_LIST 0xC11 /* list all groups in session */ #define LSTIO_GROUP_LIST 0xC11 /* list all groups in session */
#define LSTIO_GROUP_INFO 0xC12 /* query default information of #define LSTIO_GROUP_INFO 0xC12 /* query default information of
* specified group */ * specified group
*/
#define LSTIO_GROUP_DEL 0xC13 /* delete group */ #define LSTIO_GROUP_DEL 0xC13 /* delete group */
#define LSTIO_NODES_ADD 0xC14 /* add nodes to specified group */ #define LSTIO_NODES_ADD 0xC14 /* add nodes to specified group */
#define LSTIO_GROUP_UPDATE 0xC15 /* update group */ #define LSTIO_GROUP_UPDATE 0xC15 /* update group */
...@@ -102,27 +103,32 @@ struct lstcon_test_ent { ...@@ -102,27 +103,32 @@ struct lstcon_test_ent {
int tse_type; /* test type */ int tse_type; /* test type */
int tse_loop; /* loop count */ int tse_loop; /* loop count */
int tse_concur; /* concurrency of test */ int tse_concur; /* concurrency of test */
}; /*** test summary entry, for }; /* test summary entry, for
*** list_batch command */ * list_batch command
*/
struct lstcon_batch_ent { struct lstcon_batch_ent {
int bae_state; /* batch status */ int bae_state; /* batch status */
int bae_timeout; /* batch timeout */ int bae_timeout; /* batch timeout */
int bae_ntest; /* # of tests in the batch */ int bae_ntest; /* # of tests in the batch */
}; /*** batch summary entry, for }; /* batch summary entry, for
*** list_batch command */ * list_batch command
*/
struct lstcon_test_batch_ent { struct lstcon_test_batch_ent {
struct lstcon_ndlist_ent tbe_cli_nle; /* client (group) node_list struct lstcon_ndlist_ent tbe_cli_nle; /* client (group) node_list
* entry */ * entry
*/
struct lstcon_ndlist_ent tbe_srv_nle; /* server (group) node_list struct lstcon_ndlist_ent tbe_srv_nle; /* server (group) node_list
* entry */ * entry
*/
union { union {
struct lstcon_test_ent tbe_test; /* test entry */ struct lstcon_test_ent tbe_test; /* test entry */
struct lstcon_batch_ent tbe_batch;/* batch entry */ struct lstcon_batch_ent tbe_batch;/* batch entry */
} u; } u;
}; /*** test/batch verbose information entry, }; /* test/batch verbose information entry,
*** for list_batch command */ * for list_batch command
*/
struct lstcon_rpc_ent { struct lstcon_rpc_ent {
struct list_head rpe_link; /* link chain */ struct list_head rpe_link; /* link chain */
...@@ -138,10 +144,10 @@ struct lstcon_rpc_ent { ...@@ -138,10 +144,10 @@ struct lstcon_rpc_ent {
}; };
struct lstcon_trans_stat { struct lstcon_trans_stat {
int trs_rpc_stat[4]; /* RPCs stat (0: total int trs_rpc_stat[4]; /* RPCs stat (0: total 1: failed
1: failed * 2: finished
2: finished * 4: reserved
4: reserved */ */
int trs_rpc_errno; /* RPC errno */ int trs_rpc_errno; /* RPC errno */
int trs_fwk_stat[8]; /* framework stat */ int trs_fwk_stat[8]; /* framework stat */
int trs_fwk_errno; /* errno of the first remote error */ int trs_fwk_errno; /* errno of the first remote error */
...@@ -275,22 +281,28 @@ struct lstio_session_end_args { ...@@ -275,22 +281,28 @@ struct lstio_session_end_args {
struct lstio_debug_args { struct lstio_debug_args {
int lstio_dbg_key; /* IN: session key */ int lstio_dbg_key; /* IN: session key */
int lstio_dbg_type; /* IN: debug int lstio_dbg_type; /* IN: debug
session|batch| * session|batch|
group|nodes * group|nodes list
list */ */
int lstio_dbg_flags; /* IN: reserved debug int lstio_dbg_flags; /* IN: reserved debug
flags */ * flags
*/
int lstio_dbg_timeout; /* IN: timeout of int lstio_dbg_timeout; /* IN: timeout of
debug */ * debug
*/
int lstio_dbg_nmlen; /* IN: len of name */ int lstio_dbg_nmlen; /* IN: len of name */
char __user *lstio_dbg_namep; /* IN: name of char __user *lstio_dbg_namep; /* IN: name of
group|batch */ * group|batch
*/
int lstio_dbg_count; /* IN: # of test nodes int lstio_dbg_count; /* IN: # of test nodes
to debug */ * to debug
*/
struct lnet_process_id __user *lstio_dbg_idsp; /* IN: id of test struct lnet_process_id __user *lstio_dbg_idsp; /* IN: id of test
nodes */ * nodes
*/
struct list_head __user *lstio_dbg_resultp; /* OUT: list head of struct list_head __user *lstio_dbg_resultp; /* OUT: list head of
result buffer */ * result buffer
*/
}; };
struct lstio_group_add_args { struct lstio_group_add_args {
...@@ -307,7 +319,8 @@ struct lstio_group_del_args { ...@@ -307,7 +319,8 @@ struct lstio_group_del_args {
#define LST_GROUP_CLEAN 1 /* remove inactive nodes in the group */ #define LST_GROUP_CLEAN 1 /* remove inactive nodes in the group */
#define LST_GROUP_REFRESH 2 /* refresh inactive nodes #define LST_GROUP_REFRESH 2 /* refresh inactive nodes
* in the group */ * in the group
*/
#define LST_GROUP_RMND 3 /* delete nodes from the group */ #define LST_GROUP_RMND 3 /* delete nodes from the group */
struct lstio_group_update_args { struct lstio_group_update_args {
...@@ -319,7 +332,8 @@ struct lstio_group_update_args { ...@@ -319,7 +332,8 @@ struct lstio_group_update_args {
int lstio_grp_count; /* IN: # of nodes id */ int lstio_grp_count; /* IN: # of nodes id */
struct lnet_process_id __user *lstio_grp_idsp; /* IN: array of nodes */ struct lnet_process_id __user *lstio_grp_idsp; /* IN: array of nodes */
struct list_head __user *lstio_grp_resultp; /* OUT: list head of struct list_head __user *lstio_grp_resultp; /* OUT: list head of
result buffer */ * result buffer
*/
}; };
struct lstio_group_nodes_args { struct lstio_group_nodes_args {
...@@ -331,7 +345,8 @@ struct lstio_group_nodes_args { ...@@ -331,7 +345,8 @@ struct lstio_group_nodes_args {
unsigned int __user *lstio_grp_featp; unsigned int __user *lstio_grp_featp;
struct lnet_process_id __user *lstio_grp_idsp; /* IN: nodes */ struct lnet_process_id __user *lstio_grp_idsp; /* IN: nodes */
struct list_head __user *lstio_grp_resultp; /* OUT: list head of struct list_head __user *lstio_grp_resultp; /* OUT: list head of
result buffer */ * result buffer
*/
}; };
struct lstio_group_list_args { struct lstio_group_list_args {
...@@ -345,8 +360,9 @@ struct lstio_group_info_args { ...@@ -345,8 +360,9 @@ struct lstio_group_info_args {
int lstio_grp_key; /* IN: session key */ int lstio_grp_key; /* IN: session key */
int lstio_grp_nmlen; /* IN: name len */ int lstio_grp_nmlen; /* IN: name len */
char __user *lstio_grp_namep; /* IN: name */ char __user *lstio_grp_namep; /* IN: name */
struct lstcon_ndlist_ent __user *lstio_grp_entp;/* OUT: description of struct lstcon_ndlist_ent __user *lstio_grp_entp;/* OUT: description
group */ * of group
*/
int __user *lstio_grp_idxp; /* IN/OUT: node index */ int __user *lstio_grp_idxp; /* IN/OUT: node index */
int __user *lstio_grp_ndentp; /* IN/OUT: # of nodent */ int __user *lstio_grp_ndentp; /* IN/OUT: # of nodent */
struct lstcon_node_ent __user *lstio_grp_dentsp;/* OUT: nodent array */ struct lstcon_node_ent __user *lstio_grp_dentsp;/* OUT: nodent array */
...@@ -369,34 +385,41 @@ struct lstio_batch_del_args { ...@@ -369,34 +385,41 @@ struct lstio_batch_del_args {
struct lstio_batch_run_args { struct lstio_batch_run_args {
int lstio_bat_key; /* IN: session key */ int lstio_bat_key; /* IN: session key */
int lstio_bat_timeout; /* IN: timeout for int lstio_bat_timeout; /* IN: timeout for
the batch */ * the batch
*/
int lstio_bat_nmlen; /* IN: name length */ int lstio_bat_nmlen; /* IN: name length */
char __user *lstio_bat_namep; /* IN: batch name */ char __user *lstio_bat_namep; /* IN: batch name */
struct list_head __user *lstio_bat_resultp; /* OUT: list head of struct list_head __user *lstio_bat_resultp; /* OUT: list head of
result buffer */ * result buffer
*/
}; };
struct lstio_batch_stop_args { struct lstio_batch_stop_args {
int lstio_bat_key; /* IN: session key */ int lstio_bat_key; /* IN: session key */
int lstio_bat_force; /* IN: abort unfinished int lstio_bat_force; /* IN: abort unfinished
test RPC */ * test RPC
*/
int lstio_bat_nmlen; /* IN: name length */ int lstio_bat_nmlen; /* IN: name length */
char __user *lstio_bat_namep; /* IN: batch name */ char __user *lstio_bat_namep; /* IN: batch name */
struct list_head __user *lstio_bat_resultp; /* OUT: list head of struct list_head __user *lstio_bat_resultp; /* OUT: list head of
result buffer */ * result buffer
*/
}; };
struct lstio_batch_query_args { struct lstio_batch_query_args {
int lstio_bat_key; /* IN: session key */ int lstio_bat_key; /* IN: session key */
int lstio_bat_testidx; /* IN: test index */ int lstio_bat_testidx; /* IN: test index */
int lstio_bat_client; /* IN: we testing int lstio_bat_client; /* IN: we testing
client? */ * client?
*/
int lstio_bat_timeout; /* IN: timeout for int lstio_bat_timeout; /* IN: timeout for
waiting */ * waiting
*/
int lstio_bat_nmlen; /* IN: name length */ int lstio_bat_nmlen; /* IN: name length */
char __user *lstio_bat_namep; /* IN: batch name */ char __user *lstio_bat_namep; /* IN: batch name */
struct list_head __user *lstio_bat_resultp; /* OUT: list head of struct list_head __user *lstio_bat_resultp; /* OUT: list head of
result buffer */ * result buffer
*/
}; };
struct lstio_batch_list_args { struct lstio_batch_list_args {
...@@ -411,7 +434,8 @@ struct lstio_batch_info_args { ...@@ -411,7 +434,8 @@ struct lstio_batch_info_args {
int lstio_bat_nmlen; /* IN: name length */ int lstio_bat_nmlen; /* IN: name length */
char __user *lstio_bat_namep; /* IN: name */ char __user *lstio_bat_namep; /* IN: name */
int lstio_bat_server; /* IN: query server int lstio_bat_server; /* IN: query server
or not */ * or not
*/
int lstio_bat_testidx; /* IN: test index */ int lstio_bat_testidx; /* IN: test index */
struct lstcon_test_batch_ent __user *lstio_bat_entp;/* OUT: batch ent */ struct lstcon_test_batch_ent __user *lstio_bat_entp;/* OUT: batch ent */
...@@ -424,14 +448,17 @@ struct lstio_batch_info_args { ...@@ -424,14 +448,17 @@ struct lstio_batch_info_args {
struct lstio_stat_args { struct lstio_stat_args {
int lstio_sta_key; /* IN: session key */ int lstio_sta_key; /* IN: session key */
int lstio_sta_timeout; /* IN: timeout for int lstio_sta_timeout; /* IN: timeout for
stat request */ * stat request
*/
int lstio_sta_nmlen; /* IN: group name int lstio_sta_nmlen; /* IN: group name
length */ * length
*/
char __user *lstio_sta_namep; /* IN: group name */ char __user *lstio_sta_namep; /* IN: group name */
int lstio_sta_count; /* IN: # of pid */ int lstio_sta_count; /* IN: # of pid */
struct lnet_process_id __user *lstio_sta_idsp; /* IN: pid */ struct lnet_process_id __user *lstio_sta_idsp; /* IN: pid */
struct list_head __user *lstio_sta_resultp; /* OUT: list head of struct list_head __user *lstio_sta_resultp; /* OUT: list head of
result buffer */ * result buffer
*/
}; };
enum lst_test_type { enum lst_test_type {
...@@ -452,26 +479,32 @@ struct lstio_test_args { ...@@ -452,26 +479,32 @@ struct lstio_test_args {
int lstio_tes_concur; /* IN: concurrency */ int lstio_tes_concur; /* IN: concurrency */
int lstio_tes_dist; /* IN: node distribution in int lstio_tes_dist; /* IN: node distribution in
destination groups */ * destination groups
*/
int lstio_tes_span; /* IN: node span in int lstio_tes_span; /* IN: node span in
destination groups */ * destination groups
*/
int lstio_tes_sgrp_nmlen; /* IN: source group int lstio_tes_sgrp_nmlen; /* IN: source group
name length */ * name length
*/
char __user *lstio_tes_sgrp_name; /* IN: group name */ char __user *lstio_tes_sgrp_name; /* IN: group name */
int lstio_tes_dgrp_nmlen; /* IN: destination group int lstio_tes_dgrp_nmlen; /* IN: destination group
name length */ * name length
*/
char __user *lstio_tes_dgrp_name; /* IN: group name */ char __user *lstio_tes_dgrp_name; /* IN: group name */
int lstio_tes_param_len; /* IN: param buffer len */ int lstio_tes_param_len; /* IN: param buffer len */
void __user *lstio_tes_param; /* IN: parameter for specified void __user *lstio_tes_param; /* IN: parameter for specified
test: * test: lstio_bulk_param_t,
lstio_bulk_param_t, * lstio_ping_param_t,
lstio_ping_param_t, * ... more
... more */ */
int __user *lstio_tes_retp; /* OUT: private returned int __user *lstio_tes_retp; /* OUT: private returned
value */ * value
*/
struct list_head __user *lstio_tes_resultp;/* OUT: list head of struct list_head __user *lstio_tes_resultp;/* OUT: list head of
result buffer */ * result buffer
*/
}; };
enum lst_brw_type { enum lst_brw_type {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment