LU-4423 lnet: don't use iovec instead of kvec

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

diff --git a/lnet/lnet/lo.c b/lnet/lnet/lo.c
index fd709c0..7f3205a 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.
@@ -16,8 +14,8 @@
  * in the LICENSE file that accompanied this code).
  *
  * You should have received a copy of the GNU General Public License
- * version 2 along with this program; If not, see [sun.com URL with a
- * copy of GPLv2].
+ * 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
@@ -26,7 +24,7 @@
  * 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,19 +35,19 @@
 #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);
 }
 
-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,
+           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;
@@ -81,23 +79,23 @@ lolnd_recv (lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg,
 
                 lnet_finalize(ni, lntmsg, 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;
 }
 
-int
+static int
 lolnd_startup (lnet_ni_t *ni)
 {
        LASSERT (ni->ni_lnd == &the_lolnd);
@@ -113,14 +111,10 @@ lnd_t the_lolnd = {
         /* .lnd_type       = */ LOLND,
         /* .lnd_startup    = */ lolnd_startup,
         /* .lnd_shutdown   = */ lolnd_shutdown,
-        /* .lnt_ctl        = */ NULL, 
+       /* .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
 };