X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lnet%2Flnet%2Flib-msg.c;h=b1995f2da5e3a992afb91a3aa12576600ea55ee5;hb=846dd0cb79fc309703afdaae7622e4ddeb0e2e49;hp=fa12debfcd61f5b24d6e5f9e1a4eccaf6f337bf9;hpb=dd62978b709aebf3dda536f2230f1b79c5361d9c;p=fs%2Flustre-release.git diff --git a/lnet/lnet/lib-msg.c b/lnet/lnet/lib-msg.c index fa12deb..b1995f2 100644 --- a/lnet/lnet/lib-msg.c +++ b/lnet/lnet/lib-msg.c @@ -26,6 +26,8 @@ /* * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. + * + * Copyright (c) 2012, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -160,7 +162,7 @@ lnet_msg_commit(lnet_msg_t *msg, int cpt) LASSERT(!msg->msg_onactivelist); msg->msg_onactivelist = 1; - cfs_list_add(&msg->msg_activelist, &container->msc_active); + list_add(&msg->msg_activelist, &container->msc_active); counters->msgs_alloc++; if (counters->msgs_alloc > counters->msgs_max) @@ -294,7 +296,7 @@ lnet_msg_decommit(lnet_msg_t *msg, int cpt, int status) lnet_msg_decommit_rx(msg, status); } - cfs_list_del(&msg->msg_activelist); + list_del(&msg->msg_activelist); msg->msg_onactivelist = 0; the_lnet.ln_counters[cpt2]->msgs_alloc--; @@ -317,7 +319,7 @@ lnet_msg_attach_md(lnet_msg_t *msg, lnet_libmd_t *md, LASSERT(!msg->msg_routing); msg->msg_md = md; - if (msg->msg_receiving) { /* commited for receiving */ + if (msg->msg_receiving) { /* committed for receiving */ msg->msg_offset = offset; msg->msg_wanted = mlen; } @@ -393,7 +395,7 @@ lnet_complete_msg_locked(lnet_msg_t *msg, int cpt) * NB: message is committed for sending, we should return * on success because LND will finalize this message later. * - * Also, there is possibility that message is commited for + * Also, there is possibility that message is committed for * sending and also failed before delivering to LND, * i.e: ENOMEM, in that case we can't fall through either * because CPT for sending can be different with CPT for @@ -415,7 +417,7 @@ lnet_complete_msg_locked(lnet_msg_t *msg, int cpt) * NB: message is committed for sending, we should return * on success because LND will finalize this message later. * - * Also, there is possibility that message is commited for + * Also, there is possibility that message is committed for * sending and also failed before delivering to LND, * i.e: ENOMEM, in that case we can't fall through either: * - The rule is message must decommit for sending first if @@ -441,10 +443,10 @@ lnet_finalize (lnet_ni_t *ni, lnet_msg_t *msg, int status) int rc; int i; - LASSERT (!cfs_in_interrupt ()); + LASSERT (!in_interrupt ()); - if (msg == NULL) - return; + if (msg == NULL) + return; #if 0 CDEBUG(D_WARNING, "%s msg->%s Flags:%s%s%s%s%s%s%s%s%s%s%s txp %s rxp %s\n", lnet_msgtyp2str(msg->msg_type), libcfs_id2str(msg->msg_target), @@ -475,14 +477,14 @@ lnet_finalize (lnet_ni_t *ni, lnet_msg_t *msg, int status) again: rc = 0; if (!msg->msg_tx_committed && !msg->msg_rx_committed) { - /* not commited to network yet */ + /* not committed to network yet */ LASSERT(!msg->msg_onactivelist); lnet_msg_free(msg); return; } /* - * NB: routed message can be commited for both receiving and sending, + * NB: routed message can be committed for both receiving and sending, * we should finalize in LIFO order and keep counters correct. * (finalize sending first then finalize receiving) */ @@ -490,7 +492,7 @@ lnet_finalize (lnet_ni_t *ni, lnet_msg_t *msg, int status) lnet_net_lock(cpt); container = the_lnet.ln_msg_containers[cpt]; - cfs_list_add_tail(&msg->msg_list, &container->msc_finalizing); + list_add_tail(&msg->msg_list, &container->msc_finalizing); /* Recursion breaker. Don't complete the message here if I am (or * enough other threads are) already completing messages */ @@ -498,7 +500,7 @@ lnet_finalize (lnet_ni_t *ni, lnet_msg_t *msg, int status) #ifdef __KERNEL__ my_slot = -1; for (i = 0; i < container->msc_nfinalizers; i++) { - if (container->msc_finalizers[i] == cfs_current()) + if (container->msc_finalizers[i] == current) break; if (my_slot < 0 && container->msc_finalizers[i] == NULL) @@ -510,7 +512,7 @@ lnet_finalize (lnet_ni_t *ni, lnet_msg_t *msg, int status) return; } - container->msc_finalizers[my_slot] = cfs_current(); + container->msc_finalizers[my_slot] = current; #else LASSERT(container->msc_nfinalizers == 1); if (container->msc_finalizers[0] != NULL) { @@ -522,11 +524,11 @@ lnet_finalize (lnet_ni_t *ni, lnet_msg_t *msg, int status) container->msc_finalizers[0] = (struct lnet_msg_container *)1; #endif - while (!cfs_list_empty(&container->msc_finalizing)) { - msg = cfs_list_entry(container->msc_finalizing.next, - lnet_msg_t, msg_list); + while (!list_empty(&container->msc_finalizing)) { + msg = list_entry(container->msc_finalizing.next, + lnet_msg_t, msg_list); - cfs_list_del(&msg->msg_list); + list_del(&msg->msg_list); /* NB drops and regains the lnet lock if it actually does * anything, so my finalizing friends can chomp along too */ @@ -551,13 +553,13 @@ lnet_msg_container_cleanup(struct lnet_msg_container *container) if (container->msc_init == 0) return; - while (!cfs_list_empty(&container->msc_active)) { - lnet_msg_t *msg = cfs_list_entry(container->msc_active.next, - lnet_msg_t, msg_activelist); + while (!list_empty(&container->msc_active)) { + lnet_msg_t *msg = list_entry(container->msc_active.next, + lnet_msg_t, msg_activelist); LASSERT(msg->msg_onactivelist); msg->msg_onactivelist = 0; - cfs_list_del(&msg->msg_activelist); + list_del(&msg->msg_activelist); lnet_msg_free(msg); count++; } @@ -584,8 +586,8 @@ lnet_msg_container_setup(struct lnet_msg_container *container, int cpt) container->msc_init = 1; - CFS_INIT_LIST_HEAD(&container->msc_active); - CFS_INIT_LIST_HEAD(&container->msc_finalizing); + INIT_LIST_HEAD(&container->msc_active); + INIT_LIST_HEAD(&container->msc_finalizing); #ifdef LNET_USE_LIB_FREELIST memset(&container->msc_freelist, 0, sizeof(lnet_freelist_t));