LU-7734 lnet: fix routing selection

[fs/lustre-release.git] / lnet / lnet / lo.c

diff --git a/lnet/lnet/lo.c b/lnet/lnet/lo.c
index 68bdc8d..cda649b 100644 (file)
--- a/lnet/lnet/lo.c
+++ b/lnet/lnet/lo.c
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -17,16 +15,12 @@
  *
  * 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
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  */
 /*
@@ -37,90 +31,86 @@
 #define DEBUG_SUBSYSTEM S_LNET
 #include <lnet/lib-lnet.h>
 
-int
+static int
 lolnd_send (lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg)
 {
-        LASSERT (!lntmsg->msg_routing);
-        LASSERT (!lntmsg->msg_target_is_router);
-        
-        return lnet_parse(ni, &lntmsg->msg_hdr, ni->ni_nid, lntmsg, 0);
+       LASSERT(!lntmsg->msg_routing);
+       LASSERT(!lntmsg->msg_target_is_router);
+
+       return lnet_parse(ni, &lntmsg->msg_hdr, ni->ni_nid, lntmsg, 0);
 }
 
-int
+static int
 lolnd_recv (lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg,
-            int delayed, unsigned int niov, 
-            struct iovec *iov, lnet_kiov_t *kiov,
-            unsigned int offset, unsigned int mlen, unsigned int rlen)
+           int delayed, unsigned int niov,
+           struct kvec *iov, lnet_kiov_t *kiov,
+           unsigned int offset, unsigned int mlen, unsigned int rlen)
 {
-        lnet_msg_t *sendmsg = private;
+       lnet_msg_t *sendmsg = private;
+
+       if (lntmsg != NULL) {                   /* not discarding */
+               if (sendmsg->msg_iov != NULL) {
+                       if (iov != NULL)
+                               lnet_copy_iov2iov(niov, iov, offset,
+                                                 sendmsg->msg_niov,
+                                                 sendmsg->msg_iov,
+                                                 sendmsg->msg_offset, mlen);
+                       else
+                               lnet_copy_iov2kiov(niov, kiov, offset,
+                                                  sendmsg->msg_niov,
+                                                  sendmsg->msg_iov,
+                                                  sendmsg->msg_offset, mlen);
+               } else {
+                       if (iov != NULL)
+                               lnet_copy_kiov2iov(niov, iov, offset,
+                                                  sendmsg->msg_niov,
+                                                  sendmsg->msg_kiov,
+                                                  sendmsg->msg_offset, mlen);
+                       else
+                               lnet_copy_kiov2kiov(niov, kiov, offset,
+                                                   sendmsg->msg_niov,
+                                                   sendmsg->msg_kiov,
+                                                   sendmsg->msg_offset, mlen);
+               }
 
-        if (lntmsg != NULL) {                   /* not discarding */
-                if (sendmsg->msg_iov != NULL) {
-                        if (iov != NULL)
-                                lnet_copy_iov2iov(niov, iov, offset,
-                                                  sendmsg->msg_niov,
-                                                  sendmsg->msg_iov,
-                                                  sendmsg->msg_offset, mlen);
-                        else
-                                lnet_copy_iov2kiov(niov, kiov, offset,
-                                                   sendmsg->msg_niov,
-                                                   sendmsg->msg_iov,
-                                                   sendmsg->msg_offset, mlen);
-                } else {
-                        if (iov != NULL)
-                                lnet_copy_kiov2iov(niov, iov, offset,
-                                                   sendmsg->msg_niov,
-                                                   sendmsg->msg_kiov,
-                                                   sendmsg->msg_offset, mlen);
-                        else
-                                lnet_copy_kiov2kiov(niov, kiov, offset,
-                                                    sendmsg->msg_niov,
-                                                    sendmsg->msg_kiov,
-                                                    sendmsg->msg_offset, mlen);
-                }
+               lnet_finalize(ni, lntmsg, 0);
+       }
 
-                lnet_finalize(ni, lntmsg, 0);
-        }
-        
-        lnet_finalize(ni, sendmsg, 0);
-        return 0;
+       lnet_finalize(ni, sendmsg, 0);
+       return 0;
 }
 
 static int lolnd_instanced;
 
-void
+static void
 lolnd_shutdown(lnet_ni_t *ni)
 {
        CDEBUG (D_NET, "shutdown\n");
-        LASSERT (lolnd_instanced);
-        
-        lolnd_instanced = 0;
+       LASSERT(lolnd_instanced);
+
+       lolnd_instanced = 0;
 }
 
-int
+static int
 lolnd_startup (lnet_ni_t *ni)
 {
-       LASSERT (ni->ni_lnd == &the_lolnd);
+       LASSERT (ni->ni_net->net_lnd == &the_lolnd);
        LASSERT (!lolnd_instanced);
-        lolnd_instanced = 1;
+       lolnd_instanced = 1;
 
        return (0);
 }
 
 lnd_t the_lolnd = {
-        /* .lnd_list       = */ {&the_lolnd.lnd_list, &the_lolnd.lnd_list},
-        /* .lnd_refcount   = */ 0,
-        /* .lnd_type       = */ LOLND,
-        /* .lnd_startup    = */ lolnd_startup,
-        /* .lnd_shutdown   = */ lolnd_shutdown,
-        /* .lnt_ctl        = */ NULL, 
-        /* .lnd_send       = */ lolnd_send,
-        /* .lnd_recv       = */ lolnd_recv,
-        /* .lnd_eager_recv = */ NULL,
-        /* .lnd_notify     = */ NULL,
-#ifdef __KERNEL__
-        /* .lnd_accept     = */ NULL
-#else
-        /* .lnd_wait       = */ NULL
-#endif
+       /* .lnd_list       = */ {&the_lolnd.lnd_list, &the_lolnd.lnd_list},
+       /* .lnd_refcount   = */ 0,
+       /* .lnd_type       = */ LOLND,
+       /* .lnd_startup    = */ lolnd_startup,
+       /* .lnd_shutdown   = */ lolnd_shutdown,
+       /* .lnt_ctl        = */ NULL,
+       /* .lnd_send       = */ lolnd_send,
+       /* .lnd_recv       = */ lolnd_recv,
+       /* .lnd_eager_recv = */ NULL,
+       /* .lnd_notify     = */ NULL,
+       /* .lnd_accept     = */ NULL
 };