X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lnet%2Flnet%2Flo.c;h=a11ecddb08349ae92e609e93a91adcc3ee93d9bc;hb=698209700faf51c227f9ba16626de5ed70fa97c8;hp=6408bd1b81b8676a8d1fd9ccf8c635bdfe23b69b;hpb=587a25e227024c89eb0802d1b311b5521fd5793c;p=fs%2Flustre-release.git

diff --git a/lnet/lnet/lo.c b/lnet/lnet/lo.c
index 6408bd1..a11ecdd 100644
--- 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,12 +43,12 @@ 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 kvec *iov, lnet_kiov_t *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) {
@@ -73,17 +75,17 @@ lolnd_recv (lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg,
 						    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 +94,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,7 +103,7 @@ lolnd_startup (lnet_ni_t *ni)
 	return (0);
 }
 
-lnd_t the_lolnd = {
+struct lnet_lnd the_lolnd = {
 	.lnd_list	= {
 				.next = &the_lolnd.lnd_list,
 				.prev = &the_lolnd.lnd_list