LU-13806 lnet: Ensure proper peer, peer NI, peer net hierarchy

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

diff --git a/lnet/lnet/lo.c b/lnet/lnet/lo.c
index e3506fc..fad700e 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
@@ -45,22 +44,16 @@ lolnd_send(struct lnet_ni *ni, void *private, struct lnet_msg *lntmsg)
 static int
 lolnd_recv(struct lnet_ni *ni, void *private, struct lnet_msg *lntmsg,
           int delayed, unsigned int niov,
-          struct kvec *iov, struct bio_vec *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 (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);
        }