LU-13641 socklnd: announce deprecation of 'use_tcp_bonding'

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

diff --git a/lnet/lnet/lo.c b/lnet/lnet/lo.c
index 6408bd1..31e2b66 100644 (file)
--- a/lnet/lnet/lo.c
+++ b/lnet/lnet/lo.c
@@ -22,6 +22,8 @@
 /*
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2017, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -32,7 +34,7 @@
 #include <lnet/lib-lnet.h>
 
 static int
-lolnd_send (lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg)
+lolnd_send(struct lnet_ni *ni, void *private, struct lnet_msg *lntmsg)
 {
        LASSERT(!lntmsg->msg_routing);
        LASSERT(!lntmsg->msg_target_is_router);
@@ -41,49 +43,30 @@ lolnd_send (lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg)
 }
 
 static int
-lolnd_recv (lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg,
-           int delayed, unsigned int niov,
-           struct kvec *iov, lnet_kiov_t *kiov,
-           unsigned int offset, unsigned int mlen, unsigned int rlen)
+lolnd_recv(struct lnet_ni *ni, void *private, struct lnet_msg *lntmsg,
+          int delayed, unsigned int niov,
+          struct bio_vec *kiov,
+          unsigned int offset, unsigned int mlen, unsigned int rlen)
 {
-       lnet_msg_t *sendmsg = private;
+       struct lnet_msg *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) {                   /* not discarding */
+               lnet_copy_kiov2kiov(niov, kiov, offset,
+                                   sendmsg->msg_niov,
+                                   sendmsg->msg_kiov,
+                                   sendmsg->msg_offset, mlen);
 
-               lnet_finalize(ni, lntmsg, 0);
+               lnet_finalize(lntmsg, 0);
        }
 
-       lnet_finalize(ni, sendmsg, 0);
+       lnet_finalize(sendmsg, 0);
        return 0;
 }
 
 static int lolnd_instanced;
 
 static void
-lolnd_shutdown(lnet_ni_t *ni)
+lolnd_shutdown(struct lnet_ni *ni)
 {
        CDEBUG (D_NET, "shutdown\n");
        LASSERT(lolnd_instanced);
@@ -92,7 +75,7 @@ lolnd_shutdown(lnet_ni_t *ni)
 }
 
 static int
-lolnd_startup (lnet_ni_t *ni)
+lolnd_startup(struct lnet_ni *ni)
 {
        LASSERT (ni->ni_net->net_lnd == &the_lolnd);
        LASSERT (!lolnd_instanced);
@@ -101,11 +84,7 @@ lolnd_startup (lnet_ni_t *ni)
        return (0);
 }
 
-lnd_t the_lolnd = {
-       .lnd_list       = {
-                               .next = &the_lolnd.lnd_list,
-                               .prev = &the_lolnd.lnd_list
-                       },
+const struct lnet_lnd the_lolnd = {
        .lnd_type       = LOLND,
        .lnd_startup    = lolnd_startup,
        .lnd_shutdown   = lolnd_shutdown,