Whamcloud - gitweb
LU-3963 libcfs: remove proc handler wrappers
[fs/lustre-release.git] / lnet / lnet / lib-move.c
index a531d94..7657ea8 100644 (file)
 
 #include <lnet/lib-lnet.h>
 
+/** lnet message has credit and can be submitted to lnd for send/receive */
+#define LNET_CREDIT_OK         0
+/** lnet message is waiting for credit */
+#define LNET_CREDIT_WAIT       1
+
 static int local_nid_dist_zero = 1;
 CFS_MODULE_PARM(local_nid_dist_zero, "i", int, 0444,
                 "Reserved");
 
 int
-lnet_fail_nid (lnet_nid_t nid, unsigned int threshold)
+lnet_fail_nid(lnet_nid_t nid, unsigned int threshold)
 {
-        lnet_test_peer_t  *tp;
-        cfs_list_t        *el;
-        cfs_list_t        *next;
-        cfs_list_t         cull;
+       lnet_test_peer_t *tp;
+       struct list_head *el;
+       struct list_head *next;
+       struct list_head  cull;
 
-        LASSERT (the_lnet.ln_init);
+       LASSERT(the_lnet.ln_init);
 
        /* NB: use lnet_net_lock(0) to serialize operations on test peers */
         if (threshold != 0) {
@@ -67,95 +72,94 @@ lnet_fail_nid (lnet_nid_t nid, unsigned int threshold)
                 tp->tp_threshold = threshold;
 
                lnet_net_lock(0);
-               cfs_list_add_tail(&tp->tp_list, &the_lnet.ln_test_peers);
+               list_add_tail(&tp->tp_list, &the_lnet.ln_test_peers);
                lnet_net_unlock(0);
                return 0;
        }
 
        /* removing entries */
-       CFS_INIT_LIST_HEAD(&cull);
+       INIT_LIST_HEAD(&cull);
 
        lnet_net_lock(0);
 
-        cfs_list_for_each_safe (el, next, &the_lnet.ln_test_peers) {
-                tp = cfs_list_entry (el, lnet_test_peer_t, tp_list);
+       list_for_each_safe(el, next, &the_lnet.ln_test_peers) {
+               tp = list_entry(el, lnet_test_peer_t, tp_list);
 
-                if (tp->tp_threshold == 0 ||    /* needs culling anyway */
-                    nid == LNET_NID_ANY ||       /* removing all entries */
-                    tp->tp_nid == nid)          /* matched this one */
-                {
-                        cfs_list_del (&tp->tp_list);
-                        cfs_list_add (&tp->tp_list, &cull);
-                }
-        }
+               if (tp->tp_threshold == 0 ||    /* needs culling anyway */
+                   nid == LNET_NID_ANY ||      /* removing all entries */
+                   tp->tp_nid == nid) {        /* matched this one */
+                       list_del(&tp->tp_list);
+                       list_add(&tp->tp_list, &cull);
+               }
+       }
 
        lnet_net_unlock(0);
 
-        while (!cfs_list_empty (&cull)) {
-                tp = cfs_list_entry (cull.next, lnet_test_peer_t, tp_list);
+       while (!list_empty(&cull)) {
+               tp = list_entry(cull.next, lnet_test_peer_t, tp_list);
 
-                cfs_list_del (&tp->tp_list);
-                LIBCFS_FREE(tp, sizeof (*tp));
-        }
-        return 0;
+               list_del(&tp->tp_list);
+               LIBCFS_FREE(tp, sizeof(*tp));
+       }
+       return 0;
 }
 
 static int
 fail_peer (lnet_nid_t nid, int outgoing)
 {
-        lnet_test_peer_t *tp;
-        cfs_list_t       *el;
-        cfs_list_t       *next;
-        cfs_list_t        cull;
-        int               fail = 0;
+       lnet_test_peer_t *tp;
+       struct list_head *el;
+       struct list_head *next;
+       struct list_head  cull;
+       int               fail = 0;
 
-        CFS_INIT_LIST_HEAD (&cull);
+       INIT_LIST_HEAD(&cull);
 
        /* NB: use lnet_net_lock(0) to serialize operations on test peers */
        lnet_net_lock(0);
 
-        cfs_list_for_each_safe (el, next, &the_lnet.ln_test_peers) {
-                tp = cfs_list_entry (el, lnet_test_peer_t, tp_list);
-
-                if (tp->tp_threshold == 0) {
-                        /* zombie entry */
-                        if (outgoing) {
-                                /* only cull zombies on outgoing tests,
-                                 * since we may be at interrupt priority on
-                                 * incoming messages. */
-                                cfs_list_del (&tp->tp_list);
-                                cfs_list_add (&tp->tp_list, &cull);
-                        }
-                        continue;
-                }
+       list_for_each_safe(el, next, &the_lnet.ln_test_peers) {
+               tp = list_entry(el, lnet_test_peer_t, tp_list);
+
+               if (tp->tp_threshold == 0) {
+                       /* zombie entry */
+                       if (outgoing) {
+                               /* only cull zombies on outgoing tests,
+                                * since we may be at interrupt priority on
+                                * incoming messages. */
+                               list_del(&tp->tp_list);
+                               list_add(&tp->tp_list, &cull);
+                       }
+                       continue;
+               }
 
-                if (tp->tp_nid == LNET_NID_ANY || /* fail every peer */
-                    nid == tp->tp_nid) {        /* fail this peer */
-                        fail = 1;
-
-                        if (tp->tp_threshold != LNET_MD_THRESH_INF) {
-                                tp->tp_threshold--;
-                                if (outgoing &&
-                                    tp->tp_threshold == 0) {
-                                        /* see above */
-                                        cfs_list_del (&tp->tp_list);
-                                        cfs_list_add (&tp->tp_list, &cull);
-                                }
-                        }
-                        break;
-                }
-        }
+               if (tp->tp_nid == LNET_NID_ANY ||       /* fail every peer */
+                   nid == tp->tp_nid) {                /* fail this peer */
+                       fail = 1;
+
+                       if (tp->tp_threshold != LNET_MD_THRESH_INF) {
+                               tp->tp_threshold--;
+                               if (outgoing &&
+                                   tp->tp_threshold == 0) {
+                                       /* see above */
+                                       list_del(&tp->tp_list);
+                                       list_add(&tp->tp_list, &cull);
+                               }
+                       }
+                       break;
+               }
+       }
 
        lnet_net_unlock(0);
 
-        while (!cfs_list_empty (&cull)) {
-                tp = cfs_list_entry (cull.next, lnet_test_peer_t, tp_list);
-                cfs_list_del (&tp->tp_list);
+       while (!list_empty(&cull)) {
+               tp = list_entry(cull.next, lnet_test_peer_t, tp_list);
+               list_del(&tp->tp_list);
 
-                LIBCFS_FREE(tp, sizeof (*tp));
-        }
+               LIBCFS_FREE(tp, sizeof(*tp));
+       }
 
-        return (fail);
+       return fail;
 }
 
 unsigned int
@@ -163,6 +167,7 @@ lnet_iov_nob (unsigned int niov, struct iovec *iov)
 {
         unsigned int nob = 0;
 
+       LASSERT(niov == 0 || iov != NULL);
         while (niov-- > 0)
                 nob += (iov++)->iov_len;
 
@@ -323,6 +328,7 @@ lnet_kiov_nob (unsigned int niov, lnet_kiov_t *kiov)
 {
         unsigned int  nob = 0;
 
+       LASSERT(niov == 0 || kiov != NULL);
         while (niov-- > 0)
                 nob += (kiov++)->kiov_len;
 
@@ -335,17 +341,17 @@ lnet_copy_kiov2kiov (unsigned int ndiov, lnet_kiov_t *diov, unsigned int doffset
                      unsigned int nsiov, lnet_kiov_t *siov, unsigned int soffset,
                      unsigned int nob)
 {
-        /* NB diov, siov are READ-ONLY */
-        unsigned int    this_nob;
-        char           *daddr = NULL;
-        char           *saddr = NULL;
+       /* NB diov, siov are READ-ONLY */
+       unsigned int    this_nob;
+       char           *daddr = NULL;
+       char           *saddr = NULL;
 
-        if (nob == 0)
-                return;
+       if (nob == 0)
+               return;
 
-        LASSERT (!cfs_in_interrupt ());
+       LASSERT (!in_interrupt ());
 
-        LASSERT (ndiov > 0);
+       LASSERT (ndiov > 0);
         while (doffset >= diov->kiov_len) {
                 doffset -= diov->kiov_len;
                 diov++;
@@ -417,16 +423,16 @@ lnet_copy_kiov2iov (unsigned int niov, struct iovec *iov, unsigned int iovoffset
                     unsigned int nkiov, lnet_kiov_t *kiov, unsigned int kiovoffset,
                     unsigned int nob)
 {
-        /* NB iov, kiov are READ-ONLY */
-        unsigned int    this_nob;
-        char           *addr = NULL;
+       /* NB iov, kiov are READ-ONLY */
+       unsigned int    this_nob;
+       char           *addr = NULL;
 
-        if (nob == 0)
-                return;
+       if (nob == 0)
+               return;
 
-        LASSERT (!cfs_in_interrupt ());
+       LASSERT (!in_interrupt ());
 
-        LASSERT (niov > 0);
+       LASSERT (niov > 0);
         while (iovoffset >= iov->iov_len) {
                 iovoffset -= iov->iov_len;
                 iov++;
@@ -487,16 +493,16 @@ lnet_copy_iov2kiov (unsigned int nkiov, lnet_kiov_t *kiov, unsigned int kiovoffs
                     unsigned int niov, struct iovec *iov, unsigned int iovoffset,
                     unsigned int nob)
 {
-        /* NB kiov, iov are READ-ONLY */
-        unsigned int    this_nob;
-        char           *addr = NULL;
+       /* NB kiov, iov are READ-ONLY */
+       unsigned int    this_nob;
+       char           *addr = NULL;
 
-        if (nob == 0)
-                return;
+       if (nob == 0)
+               return;
 
-        LASSERT (!cfs_in_interrupt ());
+       LASSERT (!in_interrupt ());
 
-        LASSERT (nkiov > 0);
+       LASSERT (nkiov > 0);
         while (kiovoffset >= kiov->kiov_len) {
                 kiovoffset -= kiov->kiov_len;
                 kiov++;
@@ -606,13 +612,13 @@ void
 lnet_ni_recv(lnet_ni_t *ni, void *private, lnet_msg_t *msg, int delayed,
              unsigned int offset, unsigned int mlen, unsigned int rlen)
 {
-        unsigned int  niov = 0;
-        struct iovec *iov = NULL;
-        lnet_kiov_t  *kiov = NULL;
-        int           rc;
+       unsigned int  niov = 0;
+       struct iovec *iov = NULL;
+       lnet_kiov_t  *kiov = NULL;
+       int           rc;
 
-        LASSERT (!cfs_in_interrupt ());
-        LASSERT (mlen == 0 || msg != NULL);
+       LASSERT (!in_interrupt ());
+       LASSERT (mlen == 0 || msg != NULL);
 
         if (msg != NULL) {
                 LASSERT(msg->msg_receiving);
@@ -683,16 +689,16 @@ lnet_prep_send(lnet_msg_t *msg, int type, lnet_process_id_t target,
 void
 lnet_ni_send(lnet_ni_t *ni, lnet_msg_t *msg)
 {
-        void   *priv = msg->msg_private;
-        int     rc;
+       void   *priv = msg->msg_private;
+       int     rc;
 
-        LASSERT (!cfs_in_interrupt ());
-        LASSERT (LNET_NETTYP(LNET_NIDNET(ni->ni_nid)) == LOLND ||
-                 (msg->msg_txcredit && msg->msg_peertxcredit));
+       LASSERT (!in_interrupt ());
+       LASSERT (LNET_NETTYP(LNET_NIDNET(ni->ni_nid)) == LOLND ||
+                (msg->msg_txcredit && msg->msg_peertxcredit));
 
-        rc = (ni->ni_lnd->lnd_send)(ni, priv, msg);
-        if (rc < 0)
-                lnet_finalize(ni, msg, rc);
+       rc = (ni->ni_lnd->lnd_send)(ni, priv, msg);
+       if (rc < 0)
+               lnet_finalize(ni, msg, rc);
 }
 
 int
@@ -814,26 +820,30 @@ lnet_peer_alive_locked (lnet_peer_t *lp)
         return 0;
 }
 
-int
+/**
+ * \param msg The message to be sent.
+ * \param do_send True if lnet_ni_send() should be called in this function.
+ *       lnet_send() is going to lnet_net_unlock immediately after this, so
+ *       it sets do_send FALSE and I don't do the unlock/send/lock bit.
+ *
+ * \retval LNET_CREDIT_OK If \a msg sent or OK to send.
+ * \retval LNET_CREDIT_WAIT If \a msg blocked for credit.
+ * \retval -EHOSTUNREACH If the next hop of the message appears dead.
+ * \retval -ECANCELED If the MD of the message has been unlinked.
+ */
+static int
 lnet_post_send_locked(lnet_msg_t *msg, int do_send)
 {
-       /* lnet_send is going to lnet_net_unlock immediately after this,
-        * so it sets do_send FALSE and I don't do the unlock/send/lock bit.
-        * I return EAGAIN if msg blocked, EHOSTUNREACH if msg_txpeer
-        * appears dead, and 0 if sent or OK to send */
-       struct lnet_peer        *lp = msg->msg_txpeer;
-       struct lnet_ni          *ni = lp->lp_ni;
-       struct lnet_tx_queue    *tq;
-       int                     cpt;
+       lnet_peer_t             *lp = msg->msg_txpeer;
+       lnet_ni_t               *ni = lp->lp_ni;
+       int                     cpt = msg->msg_tx_cpt;
+       struct lnet_tx_queue    *tq = ni->ni_tx_queues[cpt];
 
        /* non-lnet_send() callers have checked before */
        LASSERT(!do_send || msg->msg_tx_delayed);
        LASSERT(!msg->msg_receiving);
        LASSERT(msg->msg_tx_committed);
 
-       cpt = msg->msg_tx_cpt;
-       tq = ni->ni_tx_queues[cpt];
-
        /* NB 'lp' is always the next hop */
        if ((msg->msg_target.pid & LNET_PID_USERFLAG) == 0 &&
            lnet_peer_alive_locked(lp) == 0) {
@@ -847,30 +857,44 @@ lnet_post_send_locked(lnet_msg_t *msg, int do_send)
                        lnet_finalize(ni, msg, -EHOSTUNREACH);
 
                lnet_net_lock(cpt);
-               return EHOSTUNREACH;
+               return -EHOSTUNREACH;
+       }
+
+       if (msg->msg_md != NULL &&
+           (msg->msg_md->md_flags & LNET_MD_FLAG_ABORTED) != 0) {
+               lnet_net_unlock(cpt);
+
+               CNETERR("Aborting message for %s: LNetM[DE]Unlink() already "
+                       "called on the MD/ME.\n",
+                       libcfs_id2str(msg->msg_target));
+               if (do_send)
+                       lnet_finalize(ni, msg, -ECANCELED);
+
+               lnet_net_lock(cpt);
+               return -ECANCELED;
        }
 
-        if (!msg->msg_peertxcredit) {
-                LASSERT ((lp->lp_txcredits < 0) ==
-                         !cfs_list_empty(&lp->lp_txq));
+       if (!msg->msg_peertxcredit) {
+               LASSERT((lp->lp_txcredits < 0) ==
+                       !list_empty(&lp->lp_txq));
 
-                msg->msg_peertxcredit = 1;
-                lp->lp_txqnob += msg->msg_len + sizeof(lnet_hdr_t);
-                lp->lp_txcredits--;
+               msg->msg_peertxcredit = 1;
+               lp->lp_txqnob += msg->msg_len + sizeof(lnet_hdr_t);
+               lp->lp_txcredits--;
 
-                if (lp->lp_txcredits < lp->lp_mintxcredits)
-                        lp->lp_mintxcredits = lp->lp_txcredits;
+               if (lp->lp_txcredits < lp->lp_mintxcredits)
+                       lp->lp_mintxcredits = lp->lp_txcredits;
 
-                if (lp->lp_txcredits < 0) {
+               if (lp->lp_txcredits < 0) {
                        msg->msg_tx_delayed = 1;
-                        cfs_list_add_tail(&msg->msg_list, &lp->lp_txq);
-                        return EAGAIN;
-                }
-        }
+                       list_add_tail(&msg->msg_list, &lp->lp_txq);
+                       return LNET_CREDIT_WAIT;
+               }
+       }
 
-        if (!msg->msg_txcredit) {
+       if (!msg->msg_txcredit) {
                LASSERT((tq->tq_credits < 0) ==
-                       !cfs_list_empty(&tq->tq_delayed));
+                       !list_empty(&tq->tq_delayed));
 
                msg->msg_txcredit = 1;
                tq->tq_credits--;
@@ -880,8 +904,8 @@ lnet_post_send_locked(lnet_msg_t *msg, int do_send)
 
                if (tq->tq_credits < 0) {
                        msg->msg_tx_delayed = 1;
-                       cfs_list_add_tail(&msg->msg_list, &tq->tq_delayed);
-                       return EAGAIN;
+                       list_add_tail(&msg->msg_list, &tq->tq_delayed);
+                       return LNET_CREDIT_WAIT;
                }
        }
 
@@ -890,7 +914,7 @@ lnet_post_send_locked(lnet_msg_t *msg, int do_send)
                lnet_ni_send(ni, msg);
                lnet_net_lock(cpt);
        }
-       return 0;
+       return LNET_CREDIT_OK;
 }
 
 #ifdef __KERNEL__
@@ -919,8 +943,9 @@ int
 lnet_post_routed_recv_locked (lnet_msg_t *msg, int do_recv)
 {
        /* lnet_parse is going to lnet_net_unlock immediately after this, so it
-        * sets do_recv FALSE and I don't do the unlock/send/lock bit.  I
-        * return EAGAIN if msg blocked and 0 if received or OK to receive */
+        * sets do_recv FALSE and I don't do the unlock/send/lock bit.
+        * I return LNET_CREDIT_WAIT if msg blocked and LNET_CREDIT_OK if
+        * received or OK to receive */
         lnet_peer_t         *lp = msg->msg_rxpeer;
         lnet_rtrbufpool_t   *rbp;
         lnet_rtrbuf_t       *rb;
@@ -935,47 +960,44 @@ lnet_post_routed_recv_locked (lnet_msg_t *msg, int do_recv)
        /* non-lnet_parse callers only receive delayed messages */
        LASSERT(!do_recv || msg->msg_rx_delayed);
 
-        if (!msg->msg_peerrtrcredit) {
-                LASSERT ((lp->lp_rtrcredits < 0) ==
-                         !cfs_list_empty(&lp->lp_rtrq));
+       if (!msg->msg_peerrtrcredit) {
+               LASSERT((lp->lp_rtrcredits < 0) ==
+                       !list_empty(&lp->lp_rtrq));
 
                 msg->msg_peerrtrcredit = 1;
                 lp->lp_rtrcredits--;
                 if (lp->lp_rtrcredits < lp->lp_minrtrcredits)
                         lp->lp_minrtrcredits = lp->lp_rtrcredits;
 
-                if (lp->lp_rtrcredits < 0) {
-                        /* must have checked eager_recv before here */
+               if (lp->lp_rtrcredits < 0) {
+                       /* must have checked eager_recv before here */
                        LASSERT(msg->msg_rx_ready_delay);
                        msg->msg_rx_delayed = 1;
-                        cfs_list_add_tail(&msg->msg_list, &lp->lp_rtrq);
-                        return EAGAIN;
-                }
-        }
-
-        rbp = lnet_msg2bufpool(msg);
+                       list_add_tail(&msg->msg_list, &lp->lp_rtrq);
+                       return LNET_CREDIT_WAIT;
+               }
+       }
 
-        if (!msg->msg_rtrcredit) {
-                LASSERT ((rbp->rbp_credits < 0) ==
-                         !cfs_list_empty(&rbp->rbp_msgs));
+       rbp = lnet_msg2bufpool(msg);
 
-                msg->msg_rtrcredit = 1;
-                rbp->rbp_credits--;
-                if (rbp->rbp_credits < rbp->rbp_mincredits)
-                        rbp->rbp_mincredits = rbp->rbp_credits;
+       if (!msg->msg_rtrcredit) {
+               msg->msg_rtrcredit = 1;
+               rbp->rbp_credits--;
+               if (rbp->rbp_credits < rbp->rbp_mincredits)
+                       rbp->rbp_mincredits = rbp->rbp_credits;
 
-                if (rbp->rbp_credits < 0) {
-                        /* must have checked eager_recv before here */
+               if (rbp->rbp_credits < 0) {
+                       /* must have checked eager_recv before here */
                        LASSERT(msg->msg_rx_ready_delay);
                        msg->msg_rx_delayed = 1;
-                        cfs_list_add_tail(&msg->msg_list, &rbp->rbp_msgs);
-                        return EAGAIN;
-                }
-        }
+                       list_add_tail(&msg->msg_list, &rbp->rbp_msgs);
+                       return LNET_CREDIT_WAIT;
+               }
+       }
 
-        LASSERT (!cfs_list_empty(&rbp->rbp_bufs));
-        rb = cfs_list_entry(rbp->rbp_bufs.next, lnet_rtrbuf_t, rb_list);
-        cfs_list_del(&rb->rb_list);
+       LASSERT(!list_empty(&rbp->rbp_bufs));
+       rb = list_entry(rbp->rbp_bufs.next, lnet_rtrbuf_t, rb_list);
+       list_del(&rb->rb_list);
 
         msg->msg_niov = rbp->rbp_npages;
         msg->msg_kiov = &rb->rb_kiov[0];
@@ -988,7 +1010,7 @@ lnet_post_routed_recv_locked (lnet_msg_t *msg, int do_recv)
                             0, msg->msg_len, msg->msg_len);
                lnet_net_lock(cpt);
        }
-       return 0;
+       return LNET_CREDIT_OK;
 }
 #endif
 
@@ -1006,13 +1028,13 @@ lnet_return_tx_credits_locked(lnet_msg_t *msg)
                msg->msg_txcredit = 0;
 
                LASSERT((tq->tq_credits < 0) ==
-                       !cfs_list_empty(&tq->tq_delayed));
+                       !list_empty(&tq->tq_delayed));
 
                tq->tq_credits++;
                if (tq->tq_credits <= 0) {
-                       msg2 = cfs_list_entry(tq->tq_delayed.next,
-                                             lnet_msg_t, msg_list);
-                       cfs_list_del(&msg2->msg_list);
+                       msg2 = list_entry(tq->tq_delayed.next,
+                                         lnet_msg_t, msg_list);
+                       list_del(&msg2->msg_list);
 
                        LASSERT(msg2->msg_txpeer->lp_ni == ni);
                        LASSERT(msg2->msg_tx_delayed);
@@ -1026,16 +1048,16 @@ lnet_return_tx_credits_locked(lnet_msg_t *msg)
                 msg->msg_peertxcredit = 0;
 
                 LASSERT((txpeer->lp_txcredits < 0) ==
-                        !cfs_list_empty(&txpeer->lp_txq));
+                       !list_empty(&txpeer->lp_txq));
 
                 txpeer->lp_txqnob -= msg->msg_len + sizeof(lnet_hdr_t);
                 LASSERT (txpeer->lp_txqnob >= 0);
 
                 txpeer->lp_txcredits++;
                 if (txpeer->lp_txcredits <= 0) {
-                        msg2 = cfs_list_entry(txpeer->lp_txq.next,
+                       msg2 = list_entry(txpeer->lp_txq.next,
                                               lnet_msg_t, msg_list);
-                        cfs_list_del(&msg2->msg_list);
+                       list_del(&msg2->msg_list);
 
                        LASSERT(msg2->msg_txpeer == txpeer);
                        LASSERT(msg2->msg_tx_delayed);
@@ -1050,6 +1072,45 @@ lnet_return_tx_credits_locked(lnet_msg_t *msg)
         }
 }
 
+#ifdef __KERNEL__
+void
+lnet_schedule_blocked_locked(lnet_rtrbufpool_t *rbp)
+{
+       lnet_msg_t      *msg;
+
+       if (list_empty(&rbp->rbp_msgs))
+               return;
+       msg = list_entry(rbp->rbp_msgs.next,
+                        lnet_msg_t, msg_list);
+       list_del(&msg->msg_list);
+
+       (void)lnet_post_routed_recv_locked(msg, 1);
+}
+#endif
+
+void
+lnet_drop_routed_msgs_locked(struct list_head *list, int cpt)
+{
+       lnet_msg_t       *msg;
+       lnet_msg_t       *tmp;
+       struct list_head drop;
+
+       INIT_LIST_HEAD(&drop);
+
+       list_splice_init(list, &drop);
+
+       lnet_net_unlock(cpt);
+
+       list_for_each_entry_safe(msg, tmp, &drop, msg_list) {
+               lnet_ni_recv(msg->msg_rxpeer->lp_ni, msg->msg_private, NULL,
+                            0, 0, 0, msg->msg_hdr.payload_length);
+               list_del_init(&msg->msg_list);
+               lnet_finalize(NULL, msg, -ECANCELED);
+       }
+
+       lnet_net_lock(cpt);
+}
+
 void
 lnet_return_rx_credits_locked(lnet_msg_t *msg)
 {
@@ -1057,63 +1118,79 @@ lnet_return_rx_credits_locked(lnet_msg_t *msg)
 #ifdef __KERNEL__
        lnet_msg_t      *msg2;
 
-        if (msg->msg_rtrcredit) {
-                /* give back global router credits */
-                lnet_rtrbuf_t     *rb;
-                lnet_rtrbufpool_t *rbp;
+       if (msg->msg_rtrcredit) {
+               /* give back global router credits */
+               lnet_rtrbuf_t     *rb;
+               lnet_rtrbufpool_t *rbp;
 
-                /* NB If a msg ever blocks for a buffer in rbp_msgs, it stays
-                 * there until it gets one allocated, or aborts the wait
-                 * itself */
-                LASSERT (msg->msg_kiov != NULL);
+               /* NB If a msg ever blocks for a buffer in rbp_msgs, it stays
+                * there until it gets one allocated, or aborts the wait
+                * itself */
+               LASSERT(msg->msg_kiov != NULL);
 
-                rb = cfs_list_entry(msg->msg_kiov, lnet_rtrbuf_t, rb_kiov[0]);
-                rbp = rb->rb_pool;
-                LASSERT (rbp == lnet_msg2bufpool(msg));
+               rb = list_entry(msg->msg_kiov, lnet_rtrbuf_t, rb_kiov[0]);
+               rbp = rb->rb_pool;
 
-                msg->msg_kiov = NULL;
-                msg->msg_rtrcredit = 0;
+               msg->msg_kiov = NULL;
+               msg->msg_rtrcredit = 0;
 
-                LASSERT((rbp->rbp_credits < 0) ==
-                        !cfs_list_empty(&rbp->rbp_msgs));
-                LASSERT((rbp->rbp_credits > 0) ==
-                        !cfs_list_empty(&rbp->rbp_bufs));
+               LASSERT(rbp == lnet_msg2bufpool(msg));
 
-                cfs_list_add(&rb->rb_list, &rbp->rbp_bufs);
-                rbp->rbp_credits++;
-                if (rbp->rbp_credits <= 0) {
-                        msg2 = cfs_list_entry(rbp->rbp_msgs.next,
-                                              lnet_msg_t, msg_list);
-                        cfs_list_del(&msg2->msg_list);
+               LASSERT((rbp->rbp_credits > 0) ==
+                       !list_empty(&rbp->rbp_bufs));
 
-                        (void) lnet_post_routed_recv_locked(msg2, 1);
-                }
-        }
+               /* If routing is now turned off, we just drop this buffer and
+                * don't bother trying to return credits.  */
+               if (!the_lnet.ln_routing) {
+                       lnet_destroy_rtrbuf(rb, rbp->rbp_npages);
+                       goto routing_off;
+               }
 
-        if (msg->msg_peerrtrcredit) {
-                /* give back peer router credits */
-                msg->msg_peerrtrcredit = 0;
+               /* It is possible that a user has lowered the desired number of
+                * buffers in this pool.  Make sure we never put back
+                * more buffers than the stated number. */
+               if (rbp->rbp_credits >= rbp->rbp_nbuffers) {
+                       /* Discard this buffer so we don't have too many. */
+                       lnet_destroy_rtrbuf(rb, rbp->rbp_npages);
+               } else {
+                       list_add(&rb->rb_list, &rbp->rbp_bufs);
+                       rbp->rbp_credits++;
+                       if (rbp->rbp_credits <= 0)
+                               lnet_schedule_blocked_locked(rbp);
+               }
+       }
 
-                LASSERT((rxpeer->lp_rtrcredits < 0) ==
-                        !cfs_list_empty(&rxpeer->lp_rtrq));
+routing_off:
+       if (msg->msg_peerrtrcredit) {
+               /* give back peer router credits */
+               msg->msg_peerrtrcredit = 0;
 
-                rxpeer->lp_rtrcredits++;
-                if (rxpeer->lp_rtrcredits <= 0) {
-                        msg2 = cfs_list_entry(rxpeer->lp_rtrq.next,
-                                              lnet_msg_t, msg_list);
-                        cfs_list_del(&msg2->msg_list);
+               LASSERT((rxpeer->lp_rtrcredits < 0) ==
+                       !list_empty(&rxpeer->lp_rtrq));
 
-                        (void) lnet_post_routed_recv_locked(msg2, 1);
-                }
-        }
+               rxpeer->lp_rtrcredits++;
+
+               /* drop all messages which are queued to be routed on that
+                * peer. */
+               if (!the_lnet.ln_routing) {
+                       lnet_drop_routed_msgs_locked(&rxpeer->lp_rtrq,
+                                                    msg->msg_rx_cpt);
+               } else if (rxpeer->lp_rtrcredits <= 0) {
+                       msg2 = list_entry(rxpeer->lp_rtrq.next,
+                                         lnet_msg_t, msg_list);
+                       list_del(&msg2->msg_list);
+
+                       (void) lnet_post_routed_recv_locked(msg2, 1);
+               }
+       }
 #else
-        LASSERT (!msg->msg_rtrcredit);
-        LASSERT (!msg->msg_peerrtrcredit);
+       LASSERT(!msg->msg_rtrcredit);
+       LASSERT(!msg->msg_peerrtrcredit);
 #endif
-        if (rxpeer != NULL) {
-                msg->msg_rxpeer = NULL;
-                lnet_peer_decref_locked(rxpeer);
-        }
+       if (rxpeer != NULL) {
+               msg->msg_rxpeer = NULL;
+               lnet_peer_decref_locked(rxpeer);
+       }
 }
 
 static int
@@ -1122,6 +1199,12 @@ lnet_compare_routes(lnet_route_t *r1, lnet_route_t *r2)
        lnet_peer_t *p1 = r1->lr_gateway;
        lnet_peer_t *p2 = r2->lr_gateway;
 
+       if (r1->lr_priority < r2->lr_priority)
+               return 1;
+
+       if (r1->lr_priority > r2->lr_priority)
+               return -1;
+
        if (r1->lr_hops < r2->lr_hops)
                return 1;
 
@@ -1150,9 +1233,9 @@ static lnet_peer_t *
 lnet_find_route_locked(lnet_ni_t *ni, lnet_nid_t target, lnet_nid_t rtr_nid)
 {
        lnet_remotenet_t        *rnet;
-       lnet_route_t            *rtr;
-       lnet_route_t            *rtr_best;
-       lnet_route_t            *rtr_last;
+       lnet_route_t            *route;
+       lnet_route_t            *best_route;
+       lnet_route_t            *last_route;
        struct lnet_peer        *lp_best;
        struct lnet_peer        *lp;
        int                     rc;
@@ -1165,13 +1248,11 @@ lnet_find_route_locked(lnet_ni_t *ni, lnet_nid_t target, lnet_nid_t rtr_nid)
                return NULL;
 
        lp_best = NULL;
-       rtr_best = rtr_last = NULL;
-       cfs_list_for_each_entry(rtr, &rnet->lrn_routes, lr_list) {
-               lp = rtr->lr_gateway;
+       best_route = last_route = NULL;
+       list_for_each_entry(route, &rnet->lrn_routes, lr_list) {
+               lp = route->lr_gateway;
 
-               if (!lp->lp_alive || /* gateway is down */
-                   ((lp->lp_ping_feats & LNET_PING_FEAT_NI_STATUS) != 0 &&
-                    rtr->lr_downis != 0)) /* NI to target is down */
+               if (!lnet_is_route_alive(route))
                        continue;
 
                if (ni != NULL && lp->lp_ni != ni)
@@ -1181,28 +1262,28 @@ lnet_find_route_locked(lnet_ni_t *ni, lnet_nid_t target, lnet_nid_t rtr_nid)
                        return lp;
 
                if (lp_best == NULL) {
-                       rtr_best = rtr_last = rtr;
+                       best_route = last_route = route;
                        lp_best = lp;
                        continue;
                }
 
                /* no protection on below fields, but it's harmless */
-               if (rtr_last->lr_seq - rtr->lr_seq < 0)
-                       rtr_last = rtr;
+               if (last_route->lr_seq - route->lr_seq < 0)
+                       last_route = route;
 
-               rc = lnet_compare_routes(rtr, rtr_best);
+               rc = lnet_compare_routes(route, best_route);
                if (rc < 0)
                        continue;
 
-               rtr_best = rtr;
+               best_route = route;
                lp_best = lp;
        }
 
        /* set sequence number on the best router to the latest sequence + 1
         * so we can round-robin all routers, it's race and inaccurate but
         * harmless and functional  */
-       if (rtr_best != NULL)
-               rtr_best->lr_seq = rtr_last->lr_seq + 1;
+       if (best_route != NULL)
+               best_route->lr_seq = last_route->lr_seq + 1;
        return lp_best;
 }
 
@@ -1382,13 +1463,13 @@ lnet_send(lnet_nid_t src_nid, lnet_msg_t *msg, lnet_nid_t rtr_nid)
         rc = lnet_post_send_locked(msg, 0);
        lnet_net_unlock(cpt);
 
-        if (rc == EHOSTUNREACH)
-                return -EHOSTUNREACH;
+       if (rc < 0)
+               return rc;
 
-        if (rc == 0)
+       if (rc == LNET_CREDIT_OK)
                 lnet_ni_send(src_ni, msg);
 
-        return 0;
+       return 0; /* rc == LNET_CREDIT_OK or LNET_CREDIT_WAIT */
 }
 
 static void
@@ -1654,12 +1735,20 @@ lnet_parse_ack(lnet_ni_t *ni, lnet_msg_t *msg)
        return 0;
 }
 
+/**
+ * \retval LNET_CREDIT_OK      If \a msg is forwarded
+ * \retval LNET_CREDIT_WAIT    If \a msg is blocked because w/o buffer
+ * \retval -ve                 error code
+ */
 static int
 lnet_parse_forward_locked(lnet_ni_t *ni, lnet_msg_t *msg)
 {
        int     rc = 0;
 
 #ifdef __KERNEL__
+       if (!the_lnet.ln_routing)
+               return -ECANCELED;
+
        if (msg->msg_rxpeer->lp_rtrcredits <= 0 ||
            lnet_msg2bufpool(msg)->rbp_credits <= 0) {
                if (ni->ni_lnd->lnd_eager_recv == NULL) {
@@ -1769,141 +1858,141 @@ lnet_parse(lnet_ni_t *ni, lnet_hdr_t *hdr, lnet_nid_t from_nid,
        int             cpt;
        int             for_me;
        struct lnet_msg *msg;
-        lnet_pid_t     dest_pid;
-        lnet_nid_t     dest_nid;
-        lnet_nid_t     src_nid;
-        __u32          payload_length;
-        __u32          type;
+       lnet_pid_t     dest_pid;
+       lnet_nid_t     dest_nid;
+       lnet_nid_t     src_nid;
+       __u32          payload_length;
+       __u32          type;
 
-        LASSERT (!cfs_in_interrupt ());
+       LASSERT (!in_interrupt ());
 
-        type = le32_to_cpu(hdr->type);
-        src_nid = le64_to_cpu(hdr->src_nid);
-        dest_nid = le64_to_cpu(hdr->dest_nid);
-        dest_pid = le32_to_cpu(hdr->dest_pid);
-        payload_length = le32_to_cpu(hdr->payload_length);
+       type = le32_to_cpu(hdr->type);
+       src_nid = le64_to_cpu(hdr->src_nid);
+       dest_nid = le64_to_cpu(hdr->dest_nid);
+       dest_pid = le32_to_cpu(hdr->dest_pid);
+       payload_length = le32_to_cpu(hdr->payload_length);
 
-        for_me = (ni->ni_nid == dest_nid);
+       for_me = (ni->ni_nid == dest_nid);
        cpt = lnet_cpt_of_nid(from_nid);
 
-        switch (type) {
-        case LNET_MSG_ACK:
-        case LNET_MSG_GET:
-                if (payload_length > 0) {
-                        CERROR("%s, src %s: bad %s payload %d (0 expected)\n",
-                               libcfs_nid2str(from_nid),
-                               libcfs_nid2str(src_nid),
-                               lnet_msgtyp2str(type), payload_length);
-                        return -EPROTO;
-                }
-                break;
-
-        case LNET_MSG_PUT:
-        case LNET_MSG_REPLY:
-                if (payload_length > (__u32)(for_me ? LNET_MAX_PAYLOAD : LNET_MTU)) {
-                        CERROR("%s, src %s: bad %s payload %d "
-                               "(%d max expected)\n",
-                               libcfs_nid2str(from_nid),
-                               libcfs_nid2str(src_nid),
-                               lnet_msgtyp2str(type),
-                               payload_length,
-                               for_me ? LNET_MAX_PAYLOAD : LNET_MTU);
-                        return -EPROTO;
-                }
-                break;
+       switch (type) {
+       case LNET_MSG_ACK:
+       case LNET_MSG_GET:
+               if (payload_length > 0) {
+                       CERROR("%s, src %s: bad %s payload %d (0 expected)\n",
+                              libcfs_nid2str(from_nid),
+                              libcfs_nid2str(src_nid),
+                              lnet_msgtyp2str(type), payload_length);
+                       return -EPROTO;
+               }
+               break;
+
+       case LNET_MSG_PUT:
+       case LNET_MSG_REPLY:
+               if (payload_length >
+                   (__u32)(for_me ? LNET_MAX_PAYLOAD : LNET_MTU)) {
+                       CERROR("%s, src %s: bad %s payload %d "
+                              "(%d max expected)\n",
+                              libcfs_nid2str(from_nid),
+                              libcfs_nid2str(src_nid),
+                              lnet_msgtyp2str(type),
+                              payload_length,
+                              for_me ? LNET_MAX_PAYLOAD : LNET_MTU);
+                       return -EPROTO;
+               }
+               break;
 
-        default:
-                CERROR("%s, src %s: Bad message type 0x%x\n",
-                       libcfs_nid2str(from_nid),
-                       libcfs_nid2str(src_nid), type);
-                return -EPROTO;
-        }
+       default:
+               CERROR("%s, src %s: Bad message type 0x%x\n",
+                      libcfs_nid2str(from_nid),
+                      libcfs_nid2str(src_nid), type);
+               return -EPROTO;
+       }
 
        if (the_lnet.ln_routing &&
            ni->ni_last_alive != cfs_time_current_sec()) {
-               lnet_ni_lock(ni);
-
                /* NB: so far here is the only place to set NI status to "up */
+               lnet_ni_lock(ni);
                ni->ni_last_alive = cfs_time_current_sec();
                if (ni->ni_status != NULL &&
                    ni->ni_status->ns_status == LNET_NI_STATUS_DOWN)
                        ni->ni_status->ns_status = LNET_NI_STATUS_UP;
                lnet_ni_unlock(ni);
-        }
+       }
 
-        /* Regard a bad destination NID as a protocol error.  Senders should
-         * know what they're doing; if they don't they're misconfigured, buggy
-         * or malicious so we chop them off at the knees :) */
-
-        if (!for_me) {
-                if (LNET_NIDNET(dest_nid) == LNET_NIDNET(ni->ni_nid)) {
-                        /* should have gone direct */
-                        CERROR ("%s, src %s: Bad dest nid %s "
-                                "(should have been sent direct)\n",
-                                libcfs_nid2str(from_nid),
-                                libcfs_nid2str(src_nid),
-                                libcfs_nid2str(dest_nid));
-                        return -EPROTO;
-                }
+       /* Regard a bad destination NID as a protocol error.  Senders should
+        * know what they're doing; if they don't they're misconfigured, buggy
+        * or malicious so we chop them off at the knees :) */
 
-                if (lnet_islocalnid(dest_nid)) {
-                        /* dest is another local NI; sender should have used
-                         * this node's NID on its own network */
-                        CERROR ("%s, src %s: Bad dest nid %s "
-                                "(it's my nid but on a different network)\n",
-                                libcfs_nid2str(from_nid),
-                                libcfs_nid2str(src_nid),
-                                libcfs_nid2str(dest_nid));
-                        return -EPROTO;
-                }
+       if (!for_me) {
+               if (LNET_NIDNET(dest_nid) == LNET_NIDNET(ni->ni_nid)) {
+                       /* should have gone direct */
+                       CERROR("%s, src %s: Bad dest nid %s "
+                              "(should have been sent direct)\n",
+                               libcfs_nid2str(from_nid),
+                               libcfs_nid2str(src_nid),
+                               libcfs_nid2str(dest_nid));
+                       return -EPROTO;
+               }
 
-                if (rdma_req && type == LNET_MSG_GET) {
-                        CERROR ("%s, src %s: Bad optimized GET for %s "
-                                "(final destination must be me)\n",
-                                libcfs_nid2str(from_nid),
-                                libcfs_nid2str(src_nid),
-                                libcfs_nid2str(dest_nid));
-                        return -EPROTO;
-                }
+               if (lnet_islocalnid(dest_nid)) {
+                       /* dest is another local NI; sender should have used
+                        * this node's NID on its own network */
+                       CERROR("%s, src %s: Bad dest nid %s "
+                              "(it's my nid but on a different network)\n",
+                               libcfs_nid2str(from_nid),
+                               libcfs_nid2str(src_nid),
+                               libcfs_nid2str(dest_nid));
+                       return -EPROTO;
+               }
 
-                if (!the_lnet.ln_routing) {
-                        CERROR ("%s, src %s: Dropping message for %s "
-                                "(routing not enabled)\n",
-                                libcfs_nid2str(from_nid),
-                                libcfs_nid2str(src_nid),
-                                libcfs_nid2str(dest_nid));
-                        goto drop;
-                }
-        }
+               if (rdma_req && type == LNET_MSG_GET) {
+                       CERROR("%s, src %s: Bad optimized GET for %s "
+                              "(final destination must be me)\n",
+                               libcfs_nid2str(from_nid),
+                               libcfs_nid2str(src_nid),
+                               libcfs_nid2str(dest_nid));
+                       return -EPROTO;
+               }
 
-        /* Message looks OK; we're not going to return an error, so we MUST
-         * call back lnd_recv() come what may... */
+               if (!the_lnet.ln_routing) {
+                       CERROR("%s, src %s: Dropping message for %s "
+                              "(routing not enabled)\n",
+                               libcfs_nid2str(from_nid),
+                               libcfs_nid2str(src_nid),
+                               libcfs_nid2str(dest_nid));
+                       goto drop;
+               }
+       }
 
-        if (!cfs_list_empty (&the_lnet.ln_test_peers) && /* normally we don't */
-            fail_peer (src_nid, 0))             /* shall we now? */
-        {
-                CERROR("%s, src %s: Dropping %s to simulate failure\n",
-                       libcfs_nid2str(from_nid), libcfs_nid2str(src_nid),
-                       lnet_msgtyp2str(type));
-                goto drop;
-        }
+       /* Message looks OK; we're not going to return an error, so we MUST
+        * call back lnd_recv() come what may... */
 
-        msg = lnet_msg_alloc();
-        if (msg == NULL) {
-                CERROR("%s, src %s: Dropping %s (out of memory)\n",
-                       libcfs_nid2str(from_nid), libcfs_nid2str(src_nid), 
-                       lnet_msgtyp2str(type));
-                goto drop;
-        }
+       if (!list_empty(&the_lnet.ln_test_peers) &&     /* normally we don't */
+           fail_peer(src_nid, 0)) {                    /* shall we now? */
+               CERROR("%s, src %s: Dropping %s to simulate failure\n",
+                      libcfs_nid2str(from_nid), libcfs_nid2str(src_nid),
+                      lnet_msgtyp2str(type));
+               goto drop;
+       }
 
-        /* msg zeroed in lnet_msg_alloc; i.e. flags all clear, pointers NULL etc */
+       msg = lnet_msg_alloc();
+       if (msg == NULL) {
+               CERROR("%s, src %s: Dropping %s (out of memory)\n",
+                      libcfs_nid2str(from_nid), libcfs_nid2str(src_nid),
+                      lnet_msgtyp2str(type));
+               goto drop;
+       }
 
-        msg->msg_type = type;
-        msg->msg_private = private;
-        msg->msg_receiving = 1;
-        msg->msg_len = msg->msg_wanted = payload_length;
-        msg->msg_offset = 0;
-        msg->msg_hdr = *hdr;
+       /* msg zeroed in lnet_msg_alloc; i.e. flags all clear,
+        * pointers NULL etc */
+
+       msg->msg_type = type;
+       msg->msg_private = private;
+       msg->msg_receiving = 1;
+       msg->msg_len = msg->msg_wanted = payload_length;
+       msg->msg_offset = 0;
+       msg->msg_hdr = *hdr;
        /* for building message event */
        msg->msg_from = from_nid;
        if (!for_me) {
@@ -1941,7 +2030,8 @@ lnet_parse(lnet_ni_t *ni, lnet_hdr_t *hdr, lnet_nid_t from_nid,
 
                if (rc < 0)
                        goto free_drop;
-               if (rc == 0) {
+
+               if (rc == LNET_CREDIT_OK) {
                        lnet_ni_recv(ni, msg->msg_private, msg, 0,
                                     0, payload_length, payload_length);
                }
@@ -1950,29 +2040,29 @@ lnet_parse(lnet_ni_t *ni, lnet_hdr_t *hdr, lnet_nid_t from_nid,
 
        lnet_net_unlock(cpt);
 
-        switch (type) {
-        case LNET_MSG_ACK:
-                rc = lnet_parse_ack(ni, msg);
-                break;
-        case LNET_MSG_PUT:
-                rc = lnet_parse_put(ni, msg);
-                break;
-        case LNET_MSG_GET:
-                rc = lnet_parse_get(ni, msg, rdma_req);
-                break;
-        case LNET_MSG_REPLY:
-                rc = lnet_parse_reply(ni, msg);
-                break;
-        default:
-                LASSERT(0);
+       switch (type) {
+       case LNET_MSG_ACK:
+               rc = lnet_parse_ack(ni, msg);
+               break;
+       case LNET_MSG_PUT:
+               rc = lnet_parse_put(ni, msg);
+               break;
+       case LNET_MSG_GET:
+               rc = lnet_parse_get(ni, msg, rdma_req);
+               break;
+       case LNET_MSG_REPLY:
+               rc = lnet_parse_reply(ni, msg);
+               break;
+       default:
+               LASSERT(0);
                rc = -EPROTO;
-                goto free_drop;  /* prevent an unused label if !kernel */
-        }
+               goto free_drop;  /* prevent an unused label if !kernel */
+       }
 
-        if (rc == 0)
-                return 0;
+       if (rc == 0)
+               return 0;
 
-        LASSERT (rc == ENOENT);
+       LASSERT(rc == ENOENT);
 
  free_drop:
        LASSERT(msg->msg_md == NULL);
@@ -1985,14 +2075,14 @@ lnet_parse(lnet_ni_t *ni, lnet_hdr_t *hdr, lnet_nid_t from_nid,
 EXPORT_SYMBOL(lnet_parse);
 
 void
-lnet_drop_delayed_msg_list(cfs_list_t *head, char *reason)
+lnet_drop_delayed_msg_list(struct list_head *head, char *reason)
 {
-       while (!cfs_list_empty(head)) {
+       while (!list_empty(head)) {
                lnet_process_id_t       id = {0};
                lnet_msg_t              *msg;
 
-               msg = cfs_list_entry(head->next, lnet_msg_t, msg_list);
-               cfs_list_del(&msg->msg_list);
+               msg = list_entry(head->next, lnet_msg_t, msg_list);
+               list_del(&msg->msg_list);
 
                id.nid = msg->msg_hdr.src_nid;
                id.pid = msg->msg_hdr.src_pid;
@@ -2027,14 +2117,14 @@ lnet_drop_delayed_msg_list(cfs_list_t *head, char *reason)
 }
 
 void
-lnet_recv_delayed_msg_list(cfs_list_t *head)
+lnet_recv_delayed_msg_list(struct list_head *head)
 {
-       while (!cfs_list_empty(head)) {
+       while (!list_empty(head)) {
                lnet_msg_t        *msg;
                lnet_process_id_t  id;
 
-               msg = cfs_list_entry(head->next, lnet_msg_t, msg_list);
-               cfs_list_del(&msg->msg_list);
+               msg = list_entry(head->next, lnet_msg_t, msg_list);
+               list_del(&msg->msg_list);
 
                /* md won't disappear under me, since each msg
                 * holds a ref on it */
@@ -2113,12 +2203,11 @@ LNetPut(lnet_nid_t self, lnet_handle_md_t mdh, lnet_ack_req_t ack,
        int                     cpt;
        int                     rc;
 
-        LASSERT (the_lnet.ln_init);
-        LASSERT (the_lnet.ln_refcount > 0);
+       LASSERT(the_lnet.ln_init);
+       LASSERT(the_lnet.ln_refcount > 0);
 
-        if (!cfs_list_empty (&the_lnet.ln_test_peers) && /* normally we don't */
-            fail_peer (target.nid, 1))          /* shall we now? */
-        {
+       if (!list_empty(&the_lnet.ln_test_peers) &&     /* normally we don't */
+           fail_peer(target.nid, 1)) {                 /* shall we now? */
                 CERROR("Dropping PUT to %s: simulated failure\n",
                        libcfs_id2str(target));
                 return -EIO;
@@ -2207,16 +2296,16 @@ lnet_create_reply_msg (lnet_ni_t *ni, lnet_msg_t *getmsg)
        LASSERT(!getmsg->msg_target_is_router);
        LASSERT(!getmsg->msg_routing);
 
+       if (msg == NULL) {
+               CERROR("%s: Dropping REPLY from %s: can't allocate msg\n",
+                      libcfs_nid2str(ni->ni_nid), libcfs_id2str(peer_id));
+               goto drop;
+       }
+
        cpt = lnet_cpt_of_cookie(getmd->md_lh.lh_cookie);
        lnet_res_lock(cpt);
 
-        LASSERT (getmd->md_refcount > 0);
-
-        if (msg == NULL) {
-                CERROR ("%s: Dropping REPLY from %s: can't allocate msg\n",
-                        libcfs_nid2str(ni->ni_nid), libcfs_id2str(peer_id));
-                goto drop;
-        }
+       LASSERT(getmd->md_refcount > 0);
 
         if (getmd->md_threshold == 0) {
                 CERROR ("%s: Dropping REPLY from %s for inactive MD %p\n",
@@ -2316,8 +2405,8 @@ LNetGet(lnet_nid_t self, lnet_handle_md_t mdh,
         LASSERT (the_lnet.ln_init);
         LASSERT (the_lnet.ln_refcount > 0);
 
-        if (!cfs_list_empty (&the_lnet.ln_test_peers) && /* normally we don't */
-            fail_peer (target.nid, 1))          /* shall we now? */
+       if (!list_empty(&the_lnet.ln_test_peers) &&     /* normally we don't */
+           fail_peer(target.nid, 1))                   /* shall we now? */
         {
                 CERROR("Dropping GET to %s: simulated failure\n",
                        libcfs_id2str(target));
@@ -2346,7 +2435,6 @@ LNetGet(lnet_nid_t self, lnet_handle_md_t mdh,
                lnet_res_unlock(cpt);
 
                lnet_msg_free(msg);
-
                 return -ENOENT;
         }
 
@@ -2372,11 +2460,11 @@ LNetGet(lnet_nid_t self, lnet_handle_md_t mdh,
        lnet_build_msg_event(msg, LNET_EVENT_SEND);
 
        rc = lnet_send(self, msg, LNET_NID_ANY);
-        if (rc < 0) {
-                CNETERR( "Error sending GET to %s: %d\n",
-                       libcfs_id2str(target), rc);
-                lnet_finalize (NULL, msg, rc);
-        }
+       if (rc < 0) {
+               CNETERR("Error sending GET to %s: %d\n",
+                       libcfs_id2str(target), rc);
+               lnet_finalize(NULL, msg, rc);
+       }
 
         /* completion will be signalled by an event */
         return 0;
@@ -2400,14 +2488,14 @@ EXPORT_SYMBOL(LNetGet);
 int
 LNetDist(lnet_nid_t dstnid, lnet_nid_t *srcnidp, __u32 *orderp)
 {
-       cfs_list_t              *e;
+       struct list_head        *e;
        struct lnet_ni          *ni;
        lnet_remotenet_t        *rnet;
        __u32                   dstnet = LNET_NIDNET(dstnid);
        int                     hops;
        int                     cpt;
        __u32                   order = 2;
-       cfs_list_t              *rn_list;
+       struct list_head        *rn_list;
 
         /* if !local_nid_dist_zero, I don't return a distance of 0 ever
          * (when lustre sees a distance of 0, it substitutes 0@lo), so I
@@ -2419,8 +2507,8 @@ LNetDist(lnet_nid_t dstnid, lnet_nid_t *srcnidp, __u32 *orderp)
 
        cpt = lnet_net_lock_current();
 
-        cfs_list_for_each (e, &the_lnet.ln_nis) {
-                ni = cfs_list_entry(e, lnet_ni_t, ni_list);
+       list_for_each(e, &the_lnet.ln_nis) {
+               ni = list_entry(e, lnet_ni_t, ni_list);
 
                 if (ni->ni_nid == dstnid) {
                         if (srcnidp != NULL)
@@ -2449,21 +2537,21 @@ LNetDist(lnet_nid_t dstnid, lnet_nid_t *srcnidp, __u32 *orderp)
        }
 
        rn_list = lnet_net2rnethash(dstnet);
-       cfs_list_for_each(e, rn_list) {
-                rnet = cfs_list_entry(e, lnet_remotenet_t, lrn_list);
+       list_for_each(e, rn_list) {
+               rnet = list_entry(e, lnet_remotenet_t, lrn_list);
 
-                if (rnet->lrn_net == dstnet) {
-                        lnet_route_t *route;
-                        lnet_route_t *shortest = NULL;
+               if (rnet->lrn_net == dstnet) {
+                       lnet_route_t *route;
+                       lnet_route_t *shortest = NULL;
 
-                        LASSERT (!cfs_list_empty(&rnet->lrn_routes));
+                       LASSERT(!list_empty(&rnet->lrn_routes));
 
-                        cfs_list_for_each_entry(route, &rnet->lrn_routes,
-                                                lr_list) {
-                                if (shortest == NULL ||
-                                    route->lr_hops < shortest->lr_hops)
-                                        shortest = route;
-                        }
+                       list_for_each_entry(route, &rnet->lrn_routes,
+                                           lr_list) {
+                               if (shortest == NULL ||
+                                   route->lr_hops < shortest->lr_hops)
+                                       shortest = route;
+                       }
 
                         LASSERT (shortest != NULL);
                         hops = shortest->lr_hops;
@@ -2507,7 +2595,7 @@ LNetSetAsync(lnet_process_id_t id, int nasync)
 #else
         lnet_ni_t        *ni;
         lnet_remotenet_t *rnet;
-        cfs_list_t       *tmp;
+       struct list_head *tmp;
         lnet_route_t     *route;
         lnet_nid_t       *nids;
         int               nnids;
@@ -2536,7 +2624,7 @@ LNetSetAsync(lnet_process_id_t id, int nasync)
        cpt = lnet_net_lock_current();
        rnet = lnet_find_net_locked(LNET_NIDNET(id.nid));
        if (rnet != NULL) {
-               cfs_list_for_each(tmp, &rnet->lrn_routes) {
+               list_for_each(tmp, &rnet->lrn_routes) {
                        if (nnids == maxnids) {
                                lnet_net_unlock(cpt);
                                 LIBCFS_FREE(nids, maxnids * sizeof(*nids));
@@ -2544,10 +2632,10 @@ LNetSetAsync(lnet_process_id_t id, int nasync)
                                 goto again;
                         }
 
-                        route = cfs_list_entry(tmp, lnet_route_t, lr_list);
-                        nids[nnids++] = route->lr_gateway->lp_nid;
-                }
-        }
+                       route = list_entry(tmp, lnet_route_t, lr_list);
+                       nids[nnids++] = route->lr_gateway->lp_nid;
+               }
+       }
        lnet_net_unlock(cpt);
 
         /* set async on all the routers */