Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-9575 obdclass: remove cl_for_each defines
[fs/lustre-release.git]
/
lnet
/
selftest
/
console.c
diff --git
a/lnet/selftest/console.c
b/lnet/selftest/console.c
index
f951c17
..
f2cf0a4
100644
(file)
--- a/
lnet/selftest/console.c
+++ b/
lnet/selftest/console.c
@@
-15,11
+15,7
@@
*
* You should have received a copy of the GNU General Public License
* version 2 along with this program; If not, see
*
* You should have received a copy of the GNU General Public License
* version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
*
* GPL HEADER END
*/
*
* GPL HEADER END
*/
@@
-70,7
+66,7
@@
lstcon_node_get(lstcon_node_t *nd)
}
static int
}
static int
-lstcon_node_find(
lnet_process_id_t
id, lstcon_node_t **ndpp, int create)
+lstcon_node_find(
struct lnet_process_id
id, lstcon_node_t **ndpp, int create)
{
lstcon_ndlink_t *ndl;
unsigned int idx = LNET_NIDADDR(id.nid) % LST_GLOBAL_HASHSIZE;
{
lstcon_ndlink_t *ndl;
unsigned int idx = LNET_NIDADDR(id.nid) % LST_GLOBAL_HASHSIZE;
@@
-138,8
+134,8
@@
lstcon_node_put(lstcon_node_t *nd)
}
static int
}
static int
-lstcon_ndlink_find(struct list_head *hash,
-
lnet_process_id_t id,
lstcon_ndlink_t **ndlpp, int create)
+lstcon_ndlink_find(struct list_head *hash,
struct lnet_process_id id,
+ lstcon_ndlink_t **ndlpp, int create)
{
unsigned int idx = LNET_NIDADDR(id.nid) % LST_NODE_HASHSIZE;
lstcon_ndlink_t *ndl;
{
unsigned int idx = LNET_NIDADDR(id.nid) % LST_NODE_HASHSIZE;
lstcon_ndlink_t *ndl;
@@
-285,7
+281,7
@@
lstcon_group_find(const char *name, lstcon_group_t **grpp)
}
static int
}
static int
-lstcon_group_ndlink_find(lstcon_group_t *grp,
lnet_process_id_t
id,
+lstcon_group_ndlink_find(lstcon_group_t *grp,
struct lnet_process_id
id,
lstcon_ndlink_t **ndlpp, int create)
{
int rc;
lstcon_ndlink_t **ndlpp, int create)
{
int rc;
@@
-372,7
+368,7
@@
lstcon_sesrpc_condition(int transop, lstcon_node_t *nd, void *arg)
static int
lstcon_sesrpc_readent(int transop, srpc_msg_t *msg,
static int
lstcon_sesrpc_readent(int transop, srpc_msg_t *msg,
-
lstcon_rpc_ent_
t __user *ent_up)
+
struct lstcon_rpc_en
t __user *ent_up)
{
srpc_debug_reply_t *rep;
{
srpc_debug_reply_t *rep;
@@
-401,13
+397,13
@@
lstcon_sesrpc_readent(int transop, srpc_msg_t *msg,
static int
lstcon_group_nodes_add(lstcon_group_t *grp,
static int
lstcon_group_nodes_add(lstcon_group_t *grp,
- int count,
lnet_process_id_t
__user *ids_up,
+ int count,
struct lnet_process_id
__user *ids_up,
unsigned *featp, struct list_head __user *result_up)
{
lstcon_rpc_trans_t *trans;
lstcon_ndlink_t *ndl;
lstcon_group_t *tmp;
unsigned *featp, struct list_head __user *result_up)
{
lstcon_rpc_trans_t *trans;
lstcon_ndlink_t *ndl;
lstcon_group_t *tmp;
-
lnet_process_id_t
id;
+
struct lnet_process_id
id;
int i;
int rc;
int i;
int rc;
@@
-468,13
+464,13
@@
lstcon_group_nodes_add(lstcon_group_t *grp,
static int
lstcon_group_nodes_remove(lstcon_group_t *grp,
static int
lstcon_group_nodes_remove(lstcon_group_t *grp,
- int count,
lnet_process_id_t
__user *ids_up,
+ int count,
struct lnet_process_id
__user *ids_up,
struct list_head __user *result_up)
{
lstcon_rpc_trans_t *trans;
lstcon_ndlink_t *ndl;
lstcon_group_t *tmp;
struct list_head __user *result_up)
{
lstcon_rpc_trans_t *trans;
lstcon_ndlink_t *ndl;
lstcon_group_t *tmp;
-
lnet_process_id_t
id;
+
struct lnet_process_id
id;
int rc;
int i;
int rc;
int i;
@@
-546,7
+542,7
@@
lstcon_group_add(char *name)
}
int
}
int
-lstcon_nodes_add(char *name, int count,
lnet_process_id_t
__user *ids_up,
+lstcon_nodes_add(char *name, int count,
struct lnet_process_id
__user *ids_up,
unsigned *featp, struct list_head __user *result_up)
{
lstcon_group_t *grp;
unsigned *featp, struct list_head __user *result_up)
{
lstcon_group_t *grp;
@@
-651,7
+647,7
@@
lstcon_group_clean(char *name, int args)
int
lstcon_nodes_remove(char *name, int count,
int
lstcon_nodes_remove(char *name, int count,
-
lnet_process_id_t
__user *ids_up,
+
struct lnet_process_id
__user *ids_up,
struct list_head __user *result_up)
{
lstcon_group_t *grp = NULL;
struct list_head __user *result_up)
{
lstcon_group_t *grp = NULL;
@@
-742,7
+738,7
@@
lstcon_group_list(int index, int len, char __user *name_up)
static int
lstcon_nodes_getent(struct list_head *head, int *index_p,
static int
lstcon_nodes_getent(struct list_head *head, int *index_p,
- int *count_p,
lstcon_node_ent_
t __user *dents_up)
+ int *count_p,
struct lstcon_node_en
t __user *dents_up)
{
lstcon_ndlink_t *ndl;
lstcon_node_t *nd;
{
lstcon_ndlink_t *ndl;
lstcon_node_t *nd;
@@
-781,11
+777,11
@@
lstcon_nodes_getent(struct list_head *head, int *index_p,
}
int
}
int
-lstcon_group_info(char *name,
lstcon_ndlist_ent_
t __user *gents_p,
+lstcon_group_info(char *name,
struct lstcon_ndlist_en
t __user *gents_p,
int *index_p, int *count_p,
int *index_p, int *count_p,
-
lstcon_node_ent_
t __user *dents_up)
+
struct lstcon_node_en
t __user *dents_up)
{
{
-
lstcon_ndlist_ent_
t *gentp;
+
struct lstcon_ndlist_en
t *gentp;
lstcon_group_t *grp;
lstcon_ndlink_t *ndl;
int rc;
lstcon_group_t *grp;
lstcon_ndlink_t *ndl;
int rc;
@@
-806,7
+802,7
@@
lstcon_group_info(char *name, lstcon_ndlist_ent_t __user *gents_p,
}
/* non-verbose query */
}
/* non-verbose query */
-
LIBCFS_ALLOC(gentp, sizeof(lstcon_ndlist_ent_
t));
+
LIBCFS_ALLOC(gentp, sizeof(struct lstcon_ndlist_en
t));
if (gentp == NULL) {
CERROR("Can't allocate ndlist_ent\n");
lstcon_group_decref(grp);
if (gentp == NULL) {
CERROR("Can't allocate ndlist_ent\n");
lstcon_group_decref(grp);
@@
-818,9
+814,9
@@
lstcon_group_info(char *name, lstcon_ndlist_ent_t __user *gents_p,
LST_NODE_STATE_COUNTER(ndl->ndl_node, gentp);
rc = copy_to_user(gents_p, gentp,
LST_NODE_STATE_COUNTER(ndl->ndl_node, gentp);
rc = copy_to_user(gents_p, gentp,
- sizeof(
lstcon_ndlist_ent_
t)) ? -EFAULT : 0;
+ sizeof(
struct lstcon_ndlist_en
t)) ? -EFAULT : 0;
- LIBCFS_FREE(gentp, sizeof(
lstcon_ndlist_ent_
t));
+ LIBCFS_FREE(gentp, sizeof(
struct lstcon_ndlist_en
t));
lstcon_group_decref(grp);
lstcon_group_decref(grp);
@@
-927,11
+923,11
@@
lstcon_batch_list(int index, int len, char __user *name_up)
}
int
}
int
-lstcon_batch_info(char *name,
lstcon_test_batch_ent_
t __user *ent_up,
+lstcon_batch_info(char *name,
struct lstcon_test_batch_en
t __user *ent_up,
int server, int testidx, int *index_p, int *ndent_p,
int server, int testidx, int *index_p, int *ndent_p,
-
lstcon_node_ent_
t __user *dents_up)
+
struct lstcon_node_en
t __user *dents_up)
{
{
-
lstcon_test_batch_ent_
t *entp;
+
struct lstcon_test_batch_en
t *entp;
struct list_head *clilst;
struct list_head *srvlst;
lstcon_test_t *test = NULL;
struct list_head *clilst;
struct list_head *srvlst;
lstcon_test_t *test = NULL;
@@
-970,7
+966,7
@@
lstcon_batch_info(char *name, lstcon_test_batch_ent_t __user *ent_up,
}
/* non-verbose query */
}
/* non-verbose query */
-
LIBCFS_ALLOC(entp, sizeof(lstcon_test_batch_ent_
t));
+
LIBCFS_ALLOC(entp, sizeof(struct lstcon_test_batch_en
t));
if (entp == NULL)
return -ENOMEM;
if (entp == NULL)
return -ENOMEM;
@@
-992,9
+988,9
@@
lstcon_batch_info(char *name, lstcon_test_batch_ent_t __user *ent_up,
LST_NODE_STATE_COUNTER(ndl->ndl_node, &entp->tbe_srv_nle);
rc = copy_to_user(ent_up, entp,
LST_NODE_STATE_COUNTER(ndl->ndl_node, &entp->tbe_srv_nle);
rc = copy_to_user(ent_up, entp,
- sizeof(
lstcon_test_batch_ent_
t)) ? -EFAULT : 0;
+ sizeof(
struct lstcon_test_batch_en
t)) ? -EFAULT : 0;
- LIBCFS_FREE(entp, sizeof(
lstcon_test_batch_ent_
t));
+ LIBCFS_FREE(entp, sizeof(
struct lstcon_test_batch_en
t));
return rc;
}
return rc;
}
@@
-1388,7
+1384,7
@@
lstcon_test_find(lstcon_batch_t *batch, int idx, lstcon_test_t **testpp)
static int
lstcon_tsbrpc_readent(int transop, srpc_msg_t *msg,
static int
lstcon_tsbrpc_readent(int transop, srpc_msg_t *msg,
-
lstcon_rpc_ent_
t __user *ent_up)
+
struct lstcon_rpc_en
t __user *ent_up)
{
srpc_batch_reply_t *rep = &msg->msg_body.bat_reply;
{
srpc_batch_reply_t *rep = &msg->msg_body.bat_reply;
@@
-1467,20
+1463,20
@@
lstcon_test_batch_query(char *name, int testidx, int client,
static int
lstcon_statrpc_readent(int transop, srpc_msg_t *msg,
static int
lstcon_statrpc_readent(int transop, srpc_msg_t *msg,
-
lstcon_rpc_ent_
t __user *ent_up)
+
struct lstcon_rpc_en
t __user *ent_up)
{
srpc_stat_reply_t *rep = &msg->msg_body.stat_reply;
{
srpc_stat_reply_t *rep = &msg->msg_body.stat_reply;
- s
fw_counters_t
__user *sfwk_stat;
- s
rpc_counters_t
__user *srpc_stat;
-
lnet_counters_t
__user *lnet_stat;
+ s
truct sfw_counters
__user *sfwk_stat;
+ s
truct srpc_counters
__user *srpc_stat;
+
struct lnet_counters
__user *lnet_stat;
if (rep->str_status != 0)
return 0;
if (rep->str_status != 0)
return 0;
- sfwk_stat = (s
fw_counters_t
__user *)&ent_up->rpe_payload[0];
- srpc_stat = (s
rpc_counters_t
__user *)
+ sfwk_stat = (s
truct sfw_counters
__user *)&ent_up->rpe_payload[0];
+ srpc_stat = (s
truct srpc_counters
__user *)
((char __user *)sfwk_stat + sizeof(*sfwk_stat));
((char __user *)sfwk_stat + sizeof(*sfwk_stat));
- lnet_stat = (
lnet_counters_t
__user *)
+ lnet_stat = (
struct lnet_counters
__user *)
((char __user *)srpc_stat + sizeof(*srpc_stat));
if (copy_to_user(sfwk_stat, &rep->str_fw, sizeof(*sfwk_stat)) ||
((char __user *)srpc_stat + sizeof(*srpc_stat));
if (copy_to_user(sfwk_stat, &rep->str_fw, sizeof(*sfwk_stat)) ||
@@
-1538,12
+1534,12
@@
lstcon_group_stat(char *grp_name, int timeout,
}
int
}
int
-lstcon_nodes_stat(int count,
lnet_process_id_t
__user *ids_up,
+lstcon_nodes_stat(int count,
struct lnet_process_id
__user *ids_up,
int timeout, struct list_head __user *result_up)
{
lstcon_ndlink_t *ndl;
lstcon_group_t *tmp;
int timeout, struct list_head __user *result_up)
{
lstcon_ndlink_t *ndl;
lstcon_group_t *tmp;
-
lnet_process_id_t
id;
+
struct lnet_process_id
id;
int i;
int rc;
int i;
int rc;
@@
-1650,10
+1646,10
@@
lstcon_group_debug(int timeout, char *name,
int
lstcon_nodes_debug(int timeout,
int
lstcon_nodes_debug(int timeout,
- int count,
lnet_process_id_t
__user *ids_up,
+ int count,
struct lnet_process_id
__user *ids_up,
struct list_head __user *result_up)
{
struct list_head __user *result_up)
{
-
lnet_process_id_t
id;
+
struct lnet_process_id
id;
lstcon_ndlink_t *ndl;
lstcon_group_t *grp;
int i;
lstcon_ndlink_t *ndl;
lstcon_group_t *grp;
int i;
@@
-1693,16
+1689,16
@@
lstcon_nodes_debug(int timeout,
}
int
}
int
-lstcon_session_match(
lst_sid_t
sid)
+lstcon_session_match(
struct lst_sid
sid)
{
return (console_session.ses_id.ses_nid == sid.ses_nid &&
console_session.ses_id.ses_stamp == sid.ses_stamp) ? 1: 0;
}
static void
{
return (console_session.ses_id.ses_nid == sid.ses_nid &&
console_session.ses_id.ses_stamp == sid.ses_stamp) ? 1: 0;
}
static void
-lstcon_new_session_id(
lst_sid_t
*sid)
+lstcon_new_session_id(
struct lst_sid
*sid)
{
{
-
lnet_process_id_t
id;
+
struct lnet_process_id
id;
LASSERT (console_session.ses_state == LST_SESSION_NONE);
LASSERT (console_session.ses_state == LST_SESSION_NONE);
@@
-1713,7
+1709,7
@@
lstcon_new_session_id(lst_sid_t *sid)
int
lstcon_session_new(char *name, int key, unsigned feats,
int
lstcon_session_new(char *name, int key, unsigned feats,
- int timeout, int force,
lst_sid_t
__user *sid_up)
+ int timeout, int force,
struct lst_sid
__user *sid_up)
{
int rc = 0;
int i;
{
int rc = 0;
int i;
@@
-1772,7
+1768,7
@@
lstcon_session_new(char *name, int key, unsigned feats,
}
if (copy_to_user(sid_up, &console_session.ses_id,
}
if (copy_to_user(sid_up, &console_session.ses_id,
-
sizeof(lst_sid_t
)) == 0)
+
sizeof(struct lst_sid
)) == 0)
return rc;
lstcon_session_end();
return rc;
lstcon_session_end();
@@
-1781,12
+1777,12
@@
lstcon_session_new(char *name, int key, unsigned feats,
}
int
}
int
-lstcon_session_info(
lst_sid_t
__user *sid_up, int __user *key_up,
+lstcon_session_info(
struct lst_sid
__user *sid_up, int __user *key_up,
unsigned __user *featp,
unsigned __user *featp,
-
lstcon_ndlist_ent_
t __user *ndinfo_up,
+
struct lstcon_ndlist_en
t __user *ndinfo_up,
char __user *name_up, int len)
{
char __user *name_up, int len)
{
-
lstcon_ndlist_ent_
t *entp;
+
struct lstcon_ndlist_en
t *entp;
lstcon_ndlink_t *ndl;
int rc = 0;
lstcon_ndlink_t *ndl;
int rc = 0;
@@
-1801,7
+1797,7
@@
lstcon_session_info(lst_sid_t __user *sid_up, int __user *key_up,
LST_NODE_STATE_COUNTER(ndl->ndl_node, entp);
if (copy_to_user(sid_up, &console_session.ses_id,
LST_NODE_STATE_COUNTER(ndl->ndl_node, entp);
if (copy_to_user(sid_up, &console_session.ses_id,
-
sizeof(lst_sid_t
)) ||
+
sizeof(struct lst_sid
)) ||
copy_to_user(key_up, &console_session.ses_key,
sizeof(*key_up)) ||
copy_to_user(featp, &console_session.ses_features,
copy_to_user(key_up, &console_session.ses_key,
sizeof(*key_up)) ||
copy_to_user(featp, &console_session.ses_features,
@@
-2023,7
+2019,7
@@
lstcon_console_init(void)
console_session.ses_expired = 0;
console_session.ses_feats_updated = 0;
console_session.ses_features = LST_FEATS_MASK;
console_session.ses_expired = 0;
console_session.ses_feats_updated = 0;
console_session.ses_features = LST_FEATS_MASK;
- console_session.ses_laststamp
= cfs_time_current_sec
();
+ console_session.ses_laststamp
= ktime_get_real_seconds
();
mutex_init(&console_session.ses_mutex);
mutex_init(&console_session.ses_mutex);