X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lnet%2Fselftest%2Fconrpc.c;h=2207fa5b07dfe7f871e16d90e65d48ce7b5808ce;hb=4817574ad5a31d6dbafc2bd0dfc2b6a33851ea11;hp=37455a2d4c9b843c8c0a2edde1d6dfc5b54dddb7;hpb=35a1096a4741b24dbcd674bda5daf7b8a13cfe28;p=fs%2Flustre-release.git diff --git a/lnet/selftest/conrpc.c b/lnet/selftest/conrpc.c index 37455a2..2207fa5 100644 --- a/lnet/selftest/conrpc.c +++ b/lnet/selftest/conrpc.c @@ -27,7 +27,7 @@ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2011, 2012, Intel Corporation. + * Copyright (c) 2011, 2014, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -40,7 +40,6 @@ * Author: Liang Zhen */ -#ifdef __KERNEL__ #include #include @@ -89,32 +88,32 @@ lstcon_rpc_done(srpc_client_rpc_t *rpc) spin_unlock(&rpc->crpc_lock); } -int +static int lstcon_rpc_init(lstcon_node_t *nd, int service, unsigned feats, int bulk_npg, int bulk_len, int embedded, lstcon_rpc_t *crpc) { crpc->crp_rpc = sfw_create_rpc(nd->nd_id, service, feats, bulk_npg, bulk_len, lstcon_rpc_done, (void *)crpc); - if (crpc->crp_rpc == NULL) - return -ENOMEM; - - crpc->crp_trans = NULL; - crpc->crp_node = nd; - crpc->crp_posted = 0; - crpc->crp_finished = 0; - crpc->crp_unpacked = 0; - crpc->crp_status = 0; - crpc->crp_stamp = 0; + if (crpc->crp_rpc == NULL) + return -ENOMEM; + + crpc->crp_trans = NULL; + crpc->crp_node = nd; + crpc->crp_posted = 0; + crpc->crp_finished = 0; + crpc->crp_unpacked = 0; + crpc->crp_status = 0; + crpc->crp_stamp = 0; crpc->crp_embedded = embedded; - CFS_INIT_LIST_HEAD(&crpc->crp_link); + INIT_LIST_HEAD(&crpc->crp_link); atomic_inc(&console_session.ses_rpc_counter); - return 0; + return 0; } -int +static int lstcon_rpc_prep(lstcon_node_t *nd, int service, unsigned feats, int bulk_npg, int bulk_len, lstcon_rpc_t **crpcpp) { @@ -123,10 +122,10 @@ lstcon_rpc_prep(lstcon_node_t *nd, int service, unsigned feats, spin_lock(&console_session.ses_rpc_lock); - if (!cfs_list_empty(&console_session.ses_rpc_freelist)) { - crpc = cfs_list_entry(console_session.ses_rpc_freelist.next, - lstcon_rpc_t, crp_link); - cfs_list_del_init(&crpc->crp_link); + if (!list_empty(&console_session.ses_rpc_freelist)) { + crpc = list_entry(console_session.ses_rpc_freelist.next, + lstcon_rpc_t, crp_link); + list_del_init(&crpc->crp_link); } spin_unlock(&console_session.ses_rpc_lock); @@ -151,19 +150,19 @@ lstcon_rpc_prep(lstcon_node_t *nd, int service, unsigned feats, void lstcon_rpc_put(lstcon_rpc_t *crpc) { - srpc_bulk_t *bulk = &crpc->crp_rpc->crpc_bulk; - int i; + srpc_bulk_t *bulk = &crpc->crp_rpc->crpc_bulk; + int i; - LASSERT (cfs_list_empty(&crpc->crp_link)); + LASSERT(list_empty(&crpc->crp_link)); - for (i = 0; i < bulk->bk_niov; i++) { - if (bulk->bk_iovs[i].kiov_page == NULL) - continue; + for (i = 0; i < bulk->bk_niov; i++) { + if (bulk->bk_iovs[i].kiov_page == NULL) + continue; __free_page(bulk->bk_iovs[i].kiov_page); - } + } - srpc_client_rpc_decref(crpc->crp_rpc); + srpc_client_rpc_decref(crpc->crp_rpc); if (crpc->crp_embedded) { /* embedded RPC, don't recycle it */ @@ -173,8 +172,8 @@ lstcon_rpc_put(lstcon_rpc_t *crpc) } else { spin_lock(&console_session.ses_rpc_lock); - cfs_list_add(&crpc->crp_link, - &console_session.ses_rpc_freelist); + list_add(&crpc->crp_link, + &console_session.ses_rpc_freelist); spin_unlock(&console_session.ses_rpc_lock); } @@ -183,7 +182,7 @@ lstcon_rpc_put(lstcon_rpc_t *crpc) atomic_dec(&console_session.ses_rpc_counter); } -void +static void lstcon_rpc_post(lstcon_rpc_t *crpc) { lstcon_rpc_trans_t *trans = crpc->crp_trans; @@ -236,36 +235,35 @@ lstcon_rpc_trans_name(int transop) } int -lstcon_rpc_trans_prep(cfs_list_t *translist, - int transop, lstcon_rpc_trans_t **transpp) +lstcon_rpc_trans_prep(struct list_head *translist, int transop, + lstcon_rpc_trans_t **transpp) { - lstcon_rpc_trans_t *trans; - - if (translist != NULL) { - cfs_list_for_each_entry_typed(trans, translist, - lstcon_rpc_trans_t, tas_link) { - /* Can't enqueue two private transaction on - * the same object */ - if ((trans->tas_opc & transop) == LST_TRANS_PRIVATE) - return -EPERM; - } - } + lstcon_rpc_trans_t *trans; + + if (translist != NULL) { + list_for_each_entry(trans, translist, tas_link) { + /* Can't enqueue two private transaction on + * the same object */ + if ((trans->tas_opc & transop) == LST_TRANS_PRIVATE) + return -EPERM; + } + } - /* create a trans group */ - LIBCFS_ALLOC(trans, sizeof(*trans)); - if (trans == NULL) - return -ENOMEM; + /* create a trans group */ + LIBCFS_ALLOC(trans, sizeof(*trans)); + if (trans == NULL) + return -ENOMEM; - trans->tas_opc = transop; + trans->tas_opc = transop; if (translist == NULL) - CFS_INIT_LIST_HEAD(&trans->tas_olink); - else - cfs_list_add_tail(&trans->tas_olink, translist); + INIT_LIST_HEAD(&trans->tas_olink); + else + list_add_tail(&trans->tas_olink, translist); - cfs_list_add_tail(&trans->tas_link, &console_session.ses_trans_list); + list_add_tail(&trans->tas_link, &console_session.ses_trans_list); - CFS_INIT_LIST_HEAD(&trans->tas_rpcs_list); + INIT_LIST_HEAD(&trans->tas_rpcs_list); atomic_set(&trans->tas_remaining, 0); init_waitqueue_head(&trans->tas_waitq); @@ -280,8 +278,8 @@ lstcon_rpc_trans_prep(cfs_list_t *translist, void lstcon_rpc_trans_addreq(lstcon_rpc_trans_t *trans, lstcon_rpc_t *crpc) { - cfs_list_add_tail(&crpc->crp_link, &trans->tas_rpcs_list); - crpc->crp_trans = trans; + list_add_tail(&crpc->crp_link, &trans->tas_rpcs_list); + crpc->crp_trans = trans; } void @@ -291,8 +289,7 @@ lstcon_rpc_trans_abort(lstcon_rpc_trans_t *trans, int error) lstcon_rpc_t *crpc; lstcon_node_t *nd; - cfs_list_for_each_entry_typed(crpc, &trans->tas_rpcs_list, - lstcon_rpc_t, crp_link) { + list_for_each_entry(crpc, &trans->tas_rpcs_list, crp_link) { rpc = crpc->crp_rpc; spin_lock(&rpc->crpc_lock); @@ -329,9 +326,9 @@ lstcon_rpc_trans_abort(lstcon_rpc_trans_t *trans, int error) static int lstcon_rpc_trans_check(lstcon_rpc_trans_t *trans) { - if (console_session.ses_shutdown && - !cfs_list_empty(&trans->tas_olink)) /* Not an end session RPC */ - return 1; + if (console_session.ses_shutdown && + !list_empty(&trans->tas_olink)) /* Not an end session RPC */ + return 1; return (atomic_read(&trans->tas_remaining) == 0) ? 1: 0; } @@ -339,25 +336,24 @@ lstcon_rpc_trans_check(lstcon_rpc_trans_t *trans) int lstcon_rpc_trans_postwait(lstcon_rpc_trans_t *trans, int timeout) { - lstcon_rpc_t *crpc; - int rc; + lstcon_rpc_t *crpc; + int rc; - if (cfs_list_empty(&trans->tas_rpcs_list)) + if (list_empty(&trans->tas_rpcs_list)) return 0; - if (timeout < LST_TRANS_MIN_TIMEOUT) - timeout = LST_TRANS_MIN_TIMEOUT; + if (timeout < LST_TRANS_MIN_TIMEOUT) + timeout = LST_TRANS_MIN_TIMEOUT; - CDEBUG(D_NET, "Transaction %s started\n", - lstcon_rpc_trans_name(trans->tas_opc)); + CDEBUG(D_NET, "Transaction %s started\n", + lstcon_rpc_trans_name(trans->tas_opc)); - /* post all requests */ - cfs_list_for_each_entry_typed (crpc, &trans->tas_rpcs_list, - lstcon_rpc_t, crp_link) { - LASSERT (!crpc->crp_posted); + /* post all requests */ + list_for_each_entry(crpc, &trans->tas_rpcs_list, crp_link) { + LASSERT(!crpc->crp_posted); - lstcon_rpc_post(crpc); - } + lstcon_rpc_post(crpc); + } mutex_unlock(&console_session.ses_mutex); @@ -388,7 +384,7 @@ lstcon_rpc_trans_postwait(lstcon_rpc_trans_t *trans, int timeout) return rc; } -int +static int lstcon_rpc_get_reply(lstcon_rpc_t *crpc, srpc_msg_t **msgpp) { lstcon_node_t *nd = crpc->crp_node; @@ -428,19 +424,18 @@ lstcon_rpc_get_reply(lstcon_rpc_t *crpc, srpc_msg_t **msgpp) void lstcon_rpc_trans_stat(lstcon_rpc_trans_t *trans, lstcon_trans_stat_t *stat) { - lstcon_rpc_t *crpc; - srpc_msg_t *rep; - int error; + lstcon_rpc_t *crpc; + srpc_msg_t *rep; + int error; - LASSERT (stat != NULL); + LASSERT(stat != NULL); - memset(stat, 0, sizeof(*stat)); + memset(stat, 0, sizeof(*stat)); - cfs_list_for_each_entry_typed(crpc, &trans->tas_rpcs_list, - lstcon_rpc_t, crp_link) { - lstcon_rpc_stat_total(stat, 1); + list_for_each_entry(crpc, &trans->tas_rpcs_list, crp_link) { + lstcon_rpc_stat_total(stat, 1); - LASSERT (crpc->crp_stamp != 0); + LASSERT(crpc->crp_stamp != 0); error = lstcon_rpc_get_reply(crpc, &rep); if (error != 0) { @@ -474,11 +469,11 @@ lstcon_rpc_trans_stat(lstcon_rpc_trans_t *trans, lstcon_trans_stat_t *stat) int lstcon_rpc_trans_interpreter(lstcon_rpc_trans_t *trans, - cfs_list_t *head_up, - lstcon_rpc_readent_func_t readent) + struct list_head __user *head_up, + lstcon_rpc_readent_func_t readent) { - cfs_list_t tmp; - cfs_list_t *next; + struct list_head tmp; + struct list_head __user *next; lstcon_rpc_ent_t *ent; srpc_generic_reply_t *rep; lstcon_rpc_t *crpc; @@ -488,24 +483,23 @@ lstcon_rpc_trans_interpreter(lstcon_rpc_trans_t *trans, struct timeval tv; int error; - LASSERT (head_up != NULL); + LASSERT(head_up != NULL); - next = head_up; + next = head_up; - cfs_list_for_each_entry_typed(crpc, &trans->tas_rpcs_list, - lstcon_rpc_t, crp_link) { + list_for_each_entry(crpc, &trans->tas_rpcs_list, crp_link) { if (copy_from_user(&tmp, next, - sizeof(cfs_list_t))) - return -EFAULT; + sizeof(struct list_head))) + return -EFAULT; - if (tmp.next == head_up) - return 0; + if (tmp.next == head_up) + return 0; - next = tmp.next; + next = tmp.next; - ent = cfs_list_entry(next, lstcon_rpc_ent_t, rpe_link); + ent = list_entry(next, lstcon_rpc_ent_t, rpe_link); - LASSERT (crpc->crp_stamp != 0); + LASSERT(crpc->crp_stamp != 0); error = lstcon_rpc_get_reply(crpc, &msg); @@ -550,15 +544,13 @@ lstcon_rpc_trans_interpreter(lstcon_rpc_trans_t *trans, void lstcon_rpc_trans_destroy(lstcon_rpc_trans_t *trans) { - srpc_client_rpc_t *rpc; - lstcon_rpc_t *crpc; - lstcon_rpc_t *tmp; - int count = 0; + srpc_client_rpc_t *rpc; + lstcon_rpc_t *crpc; + lstcon_rpc_t *tmp; + int count = 0; - cfs_list_for_each_entry_safe_typed(crpc, tmp, - &trans->tas_rpcs_list, - lstcon_rpc_t, crp_link) { - rpc = crpc->crp_rpc; + list_for_each_entry_safe(crpc, tmp, &trans->tas_rpcs_list, crp_link) { + rpc = crpc->crp_rpc; spin_lock(&rpc->crpc_lock); @@ -566,41 +558,41 @@ lstcon_rpc_trans_destroy(lstcon_rpc_trans_t *trans) if (!crpc->crp_posted || crpc->crp_finished) { spin_unlock(&rpc->crpc_lock); - cfs_list_del_init(&crpc->crp_link); - lstcon_rpc_put(crpc); + list_del_init(&crpc->crp_link); + lstcon_rpc_put(crpc); - continue; - } + continue; + } - /* rpcs can be still not callbacked (even LNetMDUnlink is called) - * because huge timeout for inaccessible network, don't make - * user wait for them, just abandon them, they will be recycled - * in callback */ + /* rpcs can be still not callbacked (even LNetMDUnlink is + * called) because huge timeout for inaccessible network, + * don't make user wait for them, just abandon them, they + * will be recycled in callback */ - LASSERT (crpc->crp_status != 0); + LASSERT(crpc->crp_status != 0); - crpc->crp_node = NULL; - crpc->crp_trans = NULL; - cfs_list_del_init(&crpc->crp_link); - count ++; + crpc->crp_node = NULL; + crpc->crp_trans = NULL; + list_del_init(&crpc->crp_link); + count++; spin_unlock(&rpc->crpc_lock); atomic_dec(&trans->tas_remaining); - } + } - LASSERT (atomic_read(&trans->tas_remaining) == 0); + LASSERT(atomic_read(&trans->tas_remaining) == 0); - cfs_list_del(&trans->tas_link); - if (!cfs_list_empty(&trans->tas_olink)) - cfs_list_del(&trans->tas_olink); + list_del(&trans->tas_link); + if (!list_empty(&trans->tas_olink)) + list_del(&trans->tas_olink); - CDEBUG(D_NET, "Transaction %s destroyed with %d pending RPCs\n", - lstcon_rpc_trans_name(trans->tas_opc), count); + CDEBUG(D_NET, "Transaction %s destroyed with %d pending RPCs\n", + lstcon_rpc_trans_name(trans->tas_opc), count); - LIBCFS_FREE(trans, sizeof(*trans)); + LIBCFS_FREE(trans, sizeof(*trans)); - return; + return; } int @@ -621,8 +613,8 @@ lstcon_sesrpc_prep(lstcon_node_t *nd, int transop, msrq = &(*crpc)->crp_rpc->crpc_reqstmsg.msg_body.mksn_reqst; msrq->mksn_sid = console_session.ses_id; msrq->mksn_force = console_session.ses_force; - strncpy(msrq->mksn_name, console_session.ses_name, - strlen(console_session.ses_name)); + strlcpy(msrq->mksn_name, console_session.ses_name, + sizeof(msrq->mksn_name)); break; case LST_TRANS_SESEND: @@ -711,14 +703,14 @@ lstcon_statrpc_prep(lstcon_node_t *nd, unsigned feats, lstcon_rpc_t **crpc) return 0; } -lnet_process_id_packed_t * +static lnet_process_id_packed_t * lstcon_next_id(int idx, int nkiov, lnet_kiov_t *kiov) { lnet_process_id_packed_t *pid; int i; i = idx / SFW_ID_PER_PAGE; - + LASSERT (i < nkiov); pid = (lnet_process_id_packed_t *)page_address(kiov[i].kiov_page); @@ -726,7 +718,7 @@ lstcon_next_id(int idx, int nkiov, lnet_kiov_t *kiov) return &pid[idx % SFW_ID_PER_PAGE]; } -int +static int lstcon_dstnodes_prep(lstcon_group_t *grp, int idx, int dist, int span, int nkiov, lnet_kiov_t *kiov) { @@ -747,42 +739,40 @@ lstcon_dstnodes_prep(lstcon_group_t *grp, int idx, start = ((idx / dist) * span) % grp->grp_nnode; end = ((idx / dist) * span + span - 1) % grp->grp_nnode; - cfs_list_for_each_entry_typed(ndl, &grp->grp_ndl_list, - lstcon_ndlink_t, ndl_link) { - nd = ndl->ndl_node; - if (i < start) { - i ++; - continue; - } + list_for_each_entry(ndl, &grp->grp_ndl_list, ndl_link) { + nd = ndl->ndl_node; + if (i < start) { + i++; + continue; + } - if (i > (end >= start ? end: grp->grp_nnode)) - break; + if (i > (end >= start ? end : grp->grp_nnode)) + break; - pid = lstcon_next_id((i - start), nkiov, kiov); - pid->nid = nd->nd_id.nid; - pid->pid = nd->nd_id.pid; - i++; - } + pid = lstcon_next_id((i - start), nkiov, kiov); + pid->nid = nd->nd_id.nid; + pid->pid = nd->nd_id.pid; + i++; + } - if (start <= end) /* done */ - return 0; + if (start <= end) /* done */ + return 0; - cfs_list_for_each_entry_typed(ndl, &grp->grp_ndl_list, - lstcon_ndlink_t, ndl_link) { - if (i > grp->grp_nnode + end) - break; + list_for_each_entry(ndl, &grp->grp_ndl_list, ndl_link) { + if (i > grp->grp_nnode + end) + break; - nd = ndl->ndl_node; - pid = lstcon_next_id((i - start), nkiov, kiov); - pid->nid = nd->nd_id.nid; - pid->pid = nd->nd_id.pid; - i++; - } + nd = ndl->ndl_node; + pid = lstcon_next_id((i - start), nkiov, kiov); + pid->nid = nd->nd_id.nid; + pid->pid = nd->nd_id.pid; + i++; + } - return 0; + return 0; } -int +static int lstcon_pingrpc_prep(lst_test_ping_param_t *param, srpc_test_reqst_t *req) { test_ping_req_t *prq = &req->tsr_u.ping; @@ -793,7 +783,7 @@ lstcon_pingrpc_prep(lst_test_ping_param_t *param, srpc_test_reqst_t *req) return 0; } -int +static int lstcon_bulkrpc_v0_prep(lst_test_bulk_param_t *param, srpc_test_reqst_t *req) { test_bulk_req_t *brq = &req->tsr_u.bulk_v0; @@ -806,7 +796,7 @@ lstcon_bulkrpc_v0_prep(lst_test_bulk_param_t *param, srpc_test_reqst_t *req) return 0; } -int +static int lstcon_bulkrpc_v1_prep(lst_test_bulk_param_t *param, srpc_test_reqst_t *req) { test_bulk_req_v1_t *brq = &req->tsr_u.bulk_v1; @@ -892,7 +882,7 @@ lstcon_testrpc_prep(lstcon_node_t *nd, int transop, unsigned feats, trq->tsr_ndest = test->tes_span; trq->tsr_loop = test->tes_loop; - } + } trq->tsr_sid = console_session.ses_id; trq->tsr_bid = test->tes_hdr.tsb_id; @@ -926,7 +916,7 @@ lstcon_testrpc_prep(lstcon_node_t *nd, int transop, unsigned feats, return rc; } -int +static int lstcon_sesnew_stat_reply(lstcon_rpc_trans_t *trans, lstcon_node_t *nd, srpc_msg_t *reply) { @@ -1032,7 +1022,7 @@ lstcon_rpc_stat_reply(lstcon_rpc_trans_t *trans, srpc_msg_t *msg, return; } - if (bat_rep->bar_status == EPERM && + if (bat_rep->bar_status == EPERM && trans->tas_opc == LST_TRANS_TSBSTOP) { lstcon_tsbop_stat_success(stat, 1); return; @@ -1046,12 +1036,12 @@ lstcon_rpc_stat_reply(lstcon_rpc_trans_t *trans, srpc_msg_t *msg, case LST_TRANS_TSBSRVQRY: bat_rep = &msg->msg_body.bat_reply; - if (bat_rep->bar_active != 0) + if (bat_rep->bar_active != 0) lstcon_tsbqry_stat_run(stat, 1); else lstcon_tsbqry_stat_idle(stat, 1); - if (bat_rep->bar_status == 0) + if (bat_rep->bar_status == 0) return; lstcon_tsbqry_stat_failure(stat, 1); @@ -1094,10 +1084,10 @@ lstcon_rpc_stat_reply(lstcon_rpc_trans_t *trans, srpc_msg_t *msg, } int -lstcon_rpc_trans_ndlist(cfs_list_t *ndlist, - cfs_list_t *translist, int transop, - void *arg, lstcon_rpc_cond_func_t condition, - lstcon_rpc_trans_t **transpp) +lstcon_rpc_trans_ndlist(struct list_head *ndlist, + struct list_head *translist, int transop, + void *arg, lstcon_rpc_cond_func_t condition, + lstcon_rpc_trans_t **transpp) { lstcon_rpc_trans_t *trans; lstcon_ndlink_t *ndl; @@ -1115,7 +1105,7 @@ lstcon_rpc_trans_ndlist(cfs_list_t *ndlist, } feats = trans->tas_features; - cfs_list_for_each_entry_typed(ndl, ndlist, lstcon_ndlink_t, ndl_link) { + list_for_each_entry(ndl, ndlist, ndl_link) { rc = condition == NULL ? 1 : condition(transop, ndl->ndl_node, arg); @@ -1178,7 +1168,7 @@ lstcon_rpc_trans_ndlist(cfs_list_t *ndlist, return rc; } -void +static void lstcon_rpc_pinger(void *arg) { stt_timer_t *ptimer = (stt_timer_t *)arg; @@ -1207,13 +1197,12 @@ lstcon_rpc_pinger(void *arg) (time_t)console_session.ses_timeout) console_session.ses_expired = 1; - trans = console_session.ses_ping; + trans = console_session.ses_ping; - LASSERT (trans != NULL); + LASSERT(trans != NULL); - cfs_list_for_each_entry_typed(ndl, &console_session.ses_ndl_list, - lstcon_ndlink_t, ndl_link) { - nd = ndl->ndl_node; + list_for_each_entry(ndl, &console_session.ses_ndl_list, ndl_link) { + nd = ndl->ndl_node; if (console_session.ses_expired) { /* idle console, end session on all nodes */ @@ -1235,9 +1224,9 @@ lstcon_rpc_pinger(void *arg) crpc = &nd->nd_ping; - if (crpc->crp_rpc != NULL) { - LASSERT (crpc->crp_trans == trans); - LASSERT (!cfs_list_empty(&crpc->crp_link)); + if (crpc->crp_rpc != NULL) { + LASSERT(crpc->crp_trans == trans); + LASSERT(!list_empty(&crpc->crp_link)); spin_lock(&crpc->crp_rpc->crpc_lock); @@ -1251,12 +1240,12 @@ lstcon_rpc_pinger(void *arg) spin_unlock(&crpc->crp_rpc->crpc_lock); - lstcon_rpc_get_reply(crpc, &rep); + lstcon_rpc_get_reply(crpc, &rep); - cfs_list_del_init(&crpc->crp_link); + list_del_init(&crpc->crp_link); - lstcon_rpc_put(crpc); - } + lstcon_rpc_put(crpc); + } if (nd->nd_state != LST_NODE_ACTIVE) continue; @@ -1281,7 +1270,7 @@ lstcon_rpc_pinger(void *arg) lstcon_rpc_trans_addreq(trans, crpc); lstcon_rpc_post(crpc); - count ++; + count++; } if (console_session.ses_expired) { @@ -1300,11 +1289,11 @@ lstcon_rpc_pinger(void *arg) int lstcon_rpc_pinger_start(void) { - stt_timer_t *ptimer; - int rc; + stt_timer_t *ptimer; + int rc; - LASSERT (cfs_list_empty(&console_session.ses_rpc_freelist)); - LASSERT (atomic_read(&console_session.ses_rpc_counter) == 0); + LASSERT(list_empty(&console_session.ses_rpc_freelist)); + LASSERT(atomic_read(&console_session.ses_rpc_counter) == 0); rc = lstcon_rpc_trans_prep(NULL, LST_TRANS_SESPING, &console_session.ses_ping); @@ -1340,19 +1329,19 @@ lstcon_rpc_pinger_stop(void) void lstcon_rpc_cleanup_wait(void) { - lstcon_rpc_trans_t *trans; - lstcon_rpc_t *crpc; - cfs_list_t *pacer; - cfs_list_t zlist; + lstcon_rpc_trans_t *trans; + lstcon_rpc_t *crpc; + struct list_head *pacer; + struct list_head zlist; - /* Called with hold of global mutex */ + /* Called with hold of global mutex */ - LASSERT (console_session.ses_shutdown); + LASSERT(console_session.ses_shutdown); - while (!cfs_list_empty(&console_session.ses_trans_list)) { - cfs_list_for_each(pacer, &console_session.ses_trans_list) { - trans = cfs_list_entry(pacer, lstcon_rpc_trans_t, - tas_link); + while (!list_empty(&console_session.ses_trans_list)) { + list_for_each(pacer, &console_session.ses_trans_list) { + trans = list_entry(pacer, lstcon_rpc_trans_t, + tas_link); CDEBUG(D_NET, "Session closed, wakeup transaction %s\n", lstcon_rpc_trans_name(trans->tas_opc)); @@ -1364,10 +1353,11 @@ lstcon_rpc_cleanup_wait(void) CWARN("Session is shutting down, " "waiting for termination of transactions\n"); - cfs_pause(cfs_time_seconds(1)); + set_current_state(TASK_UNINTERRUPTIBLE); + schedule_timeout(cfs_time_seconds(1)); mutex_lock(&console_session.ses_mutex); - } + } spin_lock(&console_session.ses_rpc_lock); @@ -1377,23 +1367,23 @@ lstcon_rpc_cleanup_wait(void) "waiting for %d console RPCs to being recycled\n", atomic_read(&console_session.ses_rpc_counter)); - cfs_list_add(&zlist, &console_session.ses_rpc_freelist); - cfs_list_del_init(&console_session.ses_rpc_freelist); + list_add(&zlist, &console_session.ses_rpc_freelist); + list_del_init(&console_session.ses_rpc_freelist); spin_unlock(&console_session.ses_rpc_lock); - while (!cfs_list_empty(&zlist)) { - crpc = cfs_list_entry(zlist.next, lstcon_rpc_t, crp_link); + while (!list_empty(&zlist)) { + crpc = list_entry(zlist.next, lstcon_rpc_t, crp_link); - cfs_list_del(&crpc->crp_link); - LIBCFS_FREE(crpc, sizeof(lstcon_rpc_t)); - } + list_del(&crpc->crp_link); + LIBCFS_FREE(crpc, sizeof(lstcon_rpc_t)); + } } int lstcon_rpc_module_init(void) { - CFS_INIT_LIST_HEAD(&console_session.ses_ping_timer.stt_list); + INIT_LIST_HEAD(&console_session.ses_ping_timer.stt_list); console_session.ses_ping_timer.stt_func = lstcon_rpc_pinger; console_session.ses_ping_timer.stt_data = &console_session.ses_ping_timer; @@ -1401,7 +1391,7 @@ lstcon_rpc_module_init(void) spin_lock_init(&console_session.ses_rpc_lock); atomic_set(&console_session.ses_rpc_counter, 0); - CFS_INIT_LIST_HEAD(&console_session.ses_rpc_freelist); + INIT_LIST_HEAD(&console_session.ses_rpc_freelist); return 0; } @@ -1409,8 +1399,7 @@ lstcon_rpc_module_init(void) void lstcon_rpc_module_fini(void) { - LASSERT (cfs_list_empty(&console_session.ses_rpc_freelist)); - LASSERT (atomic_read(&console_session.ses_rpc_counter) == 0); + LASSERT(list_empty(&console_session.ses_rpc_freelist)); + LASSERT(atomic_read(&console_session.ses_rpc_counter) == 0); } -#endif