LU-14895 brw: log T10 GRD tags during checksum calcs

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

diff --git a/lnet/lnet/lo.c b/lnet/lnet/lo.c
index 6b881fc..82b723c 100644 (file)
--- a/lnet/lnet/lo.c
+++ b/lnet/lnet/lo.c
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
  */
 
 #define DEBUG_SUBSYSTEM S_LNET
@@ -39,41 +38,23 @@ lolnd_send(struct lnet_ni *ni, void *private, struct lnet_msg *lntmsg)
        LASSERT(!lntmsg->msg_routing);
        LASSERT(!lntmsg->msg_target_is_router);
 
-       return lnet_parse(ni, &lntmsg->msg_hdr, ni->ni_nid, lntmsg, 0);
+       return lnet_parse(ni, &lntmsg->msg_hdr,
+                         lnet_nid_to_nid4(&ni->ni_nid), lntmsg, 0);
 }
 
 static int
 lolnd_recv(struct lnet_ni *ni, void *private, struct lnet_msg *lntmsg,
           int delayed, unsigned int niov,
-          struct kvec *iov, lnet_kiov_t *kiov,
+          struct bio_vec *kiov,
           unsigned int offset, unsigned int mlen, unsigned int rlen)
 {
        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(lntmsg, 0);
        }