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

Replace struct iovec with struct kvec.

Linux commit: f351bad2b4b4bb74810ad4f127f6602e2d2ae403

Change-Id: Ib7bb49069e42ca82d66a149617361c73ee4d710d
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-on: http://review.whamcloud.com/17205
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Reviewed-by: Frank Zago <fzago@cray.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/lnet/include/lnet/lib-lnet.h b/lnet/include/lnet/lib-lnet.h
index 7a82b11..d23e4b1 100644 (file)
--- a/lnet/include/lnet/lib-lnet.h
+++ b/lnet/include/lnet/lib-lnet.h
@@ -636,39 +636,39 @@ bool lnet_delay_rule_match_locked(lnet_hdr_t *hdr, struct lnet_msg *msg);
 void lnet_counters_get(lnet_counters_t *counters);
 void lnet_counters_reset(void);
 
 void lnet_counters_get(lnet_counters_t *counters);
 void lnet_counters_reset(void);
 

-unsigned int lnet_iov_nob (unsigned int niov, struct iovec *iov);
-int lnet_extract_iov (int dst_niov, struct iovec *dst,
-                      int src_niov, struct iovec *src,
+unsigned int lnet_iov_nob(unsigned int niov, struct kvec *iov);
+int lnet_extract_iov(int dst_niov, struct kvec *dst,
+                     int src_niov, struct kvec *src,

                       unsigned int offset, unsigned int len);
 
 unsigned int lnet_kiov_nob (unsigned int niov, lnet_kiov_t *iov);
                       unsigned int offset, unsigned int len);
 
 unsigned int lnet_kiov_nob (unsigned int niov, lnet_kiov_t *iov);

-int lnet_extract_kiov (int dst_niov, lnet_kiov_t *dst,
-                      int src_niov, lnet_kiov_t *src,
-                      unsigned int offset, unsigned int len);
-
-void lnet_copy_iov2iov (unsigned int ndiov, struct iovec *diov,
-                        unsigned int doffset,
-                        unsigned int nsiov, struct iovec *siov,
-                        unsigned int soffset, unsigned int nob);
-void lnet_copy_kiov2iov (unsigned int niov, struct iovec *iov,
-                         unsigned int iovoffset,
-                         unsigned int nkiov, lnet_kiov_t *kiov,
-                         unsigned int kiovoffset, unsigned int nob);
-void lnet_copy_iov2kiov (unsigned int nkiov, lnet_kiov_t *kiov,
-                         unsigned int kiovoffset,
-                         unsigned int niov, struct iovec *iov,
-                         unsigned int iovoffset, unsigned int nob);
-void lnet_copy_kiov2kiov (unsigned int ndkiov, lnet_kiov_t *dkiov,
-                          unsigned int doffset,
-                          unsigned int nskiov, lnet_kiov_t *skiov,
-                          unsigned int soffset, unsigned int nob);
+int lnet_extract_kiov(int dst_niov, lnet_kiov_t *dst,
+                    int src_niov, lnet_kiov_t *src,
+                    unsigned int offset, unsigned int len);
+
+void lnet_copy_iov2iov(unsigned int ndiov, struct kvec *diov,
+                      unsigned int doffset,
+                      unsigned int nsiov, struct kvec *siov,
+                      unsigned int soffset, unsigned int nob);
+void lnet_copy_kiov2iov(unsigned int niov, struct kvec *iov,
+                       unsigned int iovoffset,
+                       unsigned int nkiov, lnet_kiov_t *kiov,
+                       unsigned int kiovoffset, unsigned int nob);
+void lnet_copy_iov2kiov(unsigned int nkiov, lnet_kiov_t *kiov,
+                       unsigned int kiovoffset,
+                       unsigned int niov, struct kvec *iov,
+                       unsigned int iovoffset, unsigned int nob);
+void lnet_copy_kiov2kiov(unsigned int ndkiov, lnet_kiov_t *dkiov,
+                        unsigned int doffset,
+                        unsigned int nskiov, lnet_kiov_t *skiov,
+                        unsigned int soffset, unsigned int nob);

 
 static inline void
 lnet_copy_iov2flat(int dlen, __user void *dest, unsigned int doffset,
 
 static inline void
 lnet_copy_iov2flat(int dlen, __user void *dest, unsigned int doffset,

-                   unsigned int nsiov, struct iovec *siov, unsigned int soffset,
+                  unsigned int nsiov, struct kvec *siov, unsigned int soffset,

                    unsigned int nob)
 {
                    unsigned int nob)
 {

-        struct iovec diov = {/*.iov_base = */ dest, /*.iov_len = */ dlen};
+       struct kvec diov = {/*.iov_base = */ dest, /*.iov_len = */ dlen};

 
         lnet_copy_iov2iov(1, &diov, doffset,
                           nsiov, siov, soffset, nob);
 
         lnet_copy_iov2iov(1, &diov, doffset,
                           nsiov, siov, soffset, nob);


@@ -679,18 +679,18 @@ lnet_copy_kiov2flat(int dlen, void __user *dest, unsigned int doffset,
                    unsigned int nsiov, lnet_kiov_t *skiov,
                    unsigned int soffset, unsigned int nob)
 {
                    unsigned int nsiov, lnet_kiov_t *skiov,
                    unsigned int soffset, unsigned int nob)
 {

-        struct iovec diov = {/* .iov_base = */ dest, /* .iov_len = */ dlen};
+       struct kvec diov = {/* .iov_base = */ dest, /* .iov_len = */ dlen};

 
         lnet_copy_kiov2iov(1, &diov, doffset,
                            nsiov, skiov, soffset, nob);
 }
 
 static inline void
 
         lnet_copy_kiov2iov(1, &diov, doffset,
                            nsiov, skiov, soffset, nob);
 }
 
 static inline void

-lnet_copy_flat2iov(unsigned int ndiov, struct iovec *diov, unsigned int doffset,
+lnet_copy_flat2iov(unsigned int ndiov, struct kvec *diov, unsigned int doffset,

                   int slen, void __user *src, unsigned int soffset,
                   unsigned int nob)
 {
                   int slen, void __user *src, unsigned int soffset,
                   unsigned int nob)
 {

-        struct iovec siov = {/*.iov_base = */ src, /*.iov_len = */slen};
+       struct kvec siov = {/*.iov_base = */ src, /*.iov_len = */slen};

         lnet_copy_iov2iov(ndiov, diov, doffset,
                           1, &siov, soffset, nob);
 }
         lnet_copy_iov2iov(ndiov, diov, doffset,
                           1, &siov, soffset, nob);
 }


@@ -700,7 +700,7 @@ lnet_copy_flat2kiov(unsigned int ndiov, lnet_kiov_t *dkiov,
                    unsigned int doffset, int slen, void __user *src,
                    unsigned int soffset, unsigned int nob)
 {
                    unsigned int doffset, int slen, void __user *src,
                    unsigned int soffset, unsigned int nob)
 {

-        struct iovec siov = {/* .iov_base = */ src, /* .iov_len = */ slen};
+       struct kvec siov = {/* .iov_base = */ src, /* .iov_len = */ slen};

         lnet_copy_iov2kiov(ndiov, dkiov, doffset,
                            1, &siov, soffset, nob);
 }
         lnet_copy_iov2kiov(ndiov, dkiov, doffset,
                            1, &siov, soffset, nob);
 }

diff --git a/lnet/include/lnet/lib-types.h b/lnet/include/lnet/lib-types.h
index 678851f..1cc79b2 100644 (file)
--- a/lnet/include/lnet/lib-types.h
+++ b/lnet/include/lnet/lib-types.h
@@ -114,7 +114,7 @@ typedef struct lnet_msg {
         unsigned int          msg_wanted;
         unsigned int          msg_offset;
         unsigned int          msg_niov;
         unsigned int          msg_wanted;
         unsigned int          msg_offset;
         unsigned int          msg_niov;

-        struct iovec         *msg_iov;
+       struct kvec          *msg_iov;

         lnet_kiov_t          *msg_kiov;
 
         lnet_event_t          msg_ev;
         lnet_kiov_t          *msg_kiov;
 
         lnet_event_t          msg_ev;


@@ -169,7 +169,7 @@ typedef struct lnet_libmd {
        lnet_eq_t              *md_eq;
        unsigned int            md_niov;        /* # frags */
        union {
        lnet_eq_t              *md_eq;
        unsigned int            md_niov;        /* # frags */
        union {

-               struct iovec    iov[LNET_MAX_IOV];
+               struct kvec     iov[LNET_MAX_IOV];

                lnet_kiov_t     kiov[LNET_MAX_IOV];
        } md_iov;
 } lnet_libmd_t;
                lnet_kiov_t     kiov[LNET_MAX_IOV];
        } md_iov;
 } lnet_libmd_t;


@@ -210,7 +210,7 @@ typedef struct lnet_lnd
         /* In data movement APIs below, payload buffers are described as a set
          * of 'niov' fragments which are...
          * EITHER
         /* In data movement APIs below, payload buffers are described as a set
          * of 'niov' fragments which are...
          * EITHER

-         *    in virtual memory (struct iovec *iov != NULL)
+        *    in virtual memory (struct kvec *iov != NULL)

          * OR
          *    in pages (kernel only: plt_kiov_t *kiov != NULL).
          * The LND may NOT overwrite these fragment descriptors.
          * OR
          *    in pages (kernel only: plt_kiov_t *kiov != NULL).
          * The LND may NOT overwrite these fragment descriptors.


@@ -232,7 +232,7 @@ typedef struct lnet_lnd
          * credit if the LND does flow control. */
         int (*lnd_recv)(struct lnet_ni *ni, void *private, lnet_msg_t *msg,
                         int delayed, unsigned int niov,
          * credit if the LND does flow control. */
         int (*lnd_recv)(struct lnet_ni *ni, void *private, lnet_msg_t *msg,
                         int delayed, unsigned int niov,

-                        struct iovec *iov, lnet_kiov_t *kiov,
+                       struct kvec *iov, lnet_kiov_t *kiov,

                         unsigned int offset, unsigned int mlen, unsigned int rlen);
 
         /* lnet_parse() has had to delay processing of this message
                         unsigned int offset, unsigned int mlen, unsigned int rlen);
 
         /* lnet_parse() has had to delay processing of this message

diff --git a/lnet/include/lnet/types.h b/lnet/include/lnet/types.h
index 9c31da4..0ffad86 100644 (file)
--- a/lnet/include/lnet/types.h
+++ b/lnet/include/lnet/types.h
@@ -355,9 +355,9 @@ typedef struct {
          * than LNET_MAX_IOV. The lnet_kiov_t is used to describe page-based
          * fragments that are not necessarily mapped in virtal memory.
          * - LNET_MD_IOVEC bit set: The start field points to the starting
          * than LNET_MAX_IOV. The lnet_kiov_t is used to describe page-based
          * fragments that are not necessarily mapped in virtal memory.
          * - LNET_MD_IOVEC bit set: The start field points to the starting

-         * address of an array of struct iovec and the length field specifies
+        * address of an array of struct kvec and the length field specifies

          * the number of entries in the array. The length can't be bigger
          * the number of entries in the array. The length can't be bigger

-         * than LNET_MAX_IOV. The struct iovec is used to describe fragments
+        * than LNET_MAX_IOV. The struct kvec is used to describe fragments

          * that have virtual addresses.
          * - Otherwise: The memory region is contiguous. The start field
          * specifies the starting address for the memory region and the
          * that have virtual addresses.
          * - Otherwise: The memory region is contiguous. The start field
          * specifies the starting address for the memory region and the

diff --git a/lnet/klnds/gnilnd/gnilnd.h b/lnet/klnds/gnilnd/gnilnd.h
index 436fa74..9f6b36b 100644 (file)
--- a/lnet/klnds/gnilnd/gnilnd.h
+++ b/lnet/klnds/gnilnd/gnilnd.h
@@ -1741,7 +1741,7 @@ int kgnilnd_eager_recv(lnet_ni_t *ni, void *private,
                        lnet_msg_t *lntmsg, void **new_private);
 int kgnilnd_recv(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg,
                int delayed, unsigned int niov,
                        lnet_msg_t *lntmsg, void **new_private);
 int kgnilnd_recv(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg,
                int delayed, unsigned int niov,

-               struct iovec *iov, lnet_kiov_t *kiov,
+               struct kvec *iov, lnet_kiov_t *kiov,

                unsigned int offset, unsigned int mlen, unsigned int rlen);
 
 __u16 kgnilnd_cksum_kiov(unsigned int nkiov, lnet_kiov_t *kiov, unsigned int offset, unsigned int nob, int dump_blob);
                unsigned int offset, unsigned int mlen, unsigned int rlen);
 
 __u16 kgnilnd_cksum_kiov(unsigned int nkiov, lnet_kiov_t *kiov, unsigned int offset, unsigned int nob, int dump_blob);

diff --git a/lnet/klnds/gnilnd/gnilnd_cb.c b/lnet/klnds/gnilnd/gnilnd_cb.c
index b8f56f5..ab86f2c 100644 (file)
--- a/lnet/klnds/gnilnd/gnilnd_cb.c
+++ b/lnet/klnds/gnilnd/gnilnd_cb.c
@@ -490,9 +490,9 @@ kgnilnd_nak_rdma(kgn_conn_t *conn, int rx_type, int error, __u64 cookie, lnet_ni
 }
 
 int
 }
 
 int

-kgnilnd_setup_immediate_buffer(kgn_tx_t *tx, unsigned int niov, struct iovec *iov,
-                              lnet_kiov_t *kiov, unsigned int offset, unsigned int nob)
-
+kgnilnd_setup_immediate_buffer(kgn_tx_t *tx, unsigned int niov,
+                              struct kvec *iov, lnet_kiov_t *kiov,
+                              unsigned int offset, unsigned int nob)

 {
        kgn_msg_t       *msg = &tx->tx_msg;
        int              i;
 {
        kgn_msg_t       *msg = &tx->tx_msg;
        int              i;


@@ -605,7 +605,7 @@ kgnilnd_setup_immediate_buffer(kgn_tx_t *tx, unsigned int niov, struct iovec *io
 
 int
 kgnilnd_setup_virt_buffer(kgn_tx_t *tx,
 
 int
 kgnilnd_setup_virt_buffer(kgn_tx_t *tx,

-                         unsigned int niov, struct iovec *iov,
+                         unsigned int niov, struct kvec *iov,

                          unsigned int offset, unsigned int nob)
 
 {
                          unsigned int offset, unsigned int nob)
 
 {


@@ -745,7 +745,7 @@ error:
 
 static inline int
 kgnilnd_setup_rdma_buffer(kgn_tx_t *tx, unsigned int niov,
 
 static inline int
 kgnilnd_setup_rdma_buffer(kgn_tx_t *tx, unsigned int niov,

-                         struct iovec *iov, lnet_kiov_t *kiov,
+                         struct kvec *iov, lnet_kiov_t *kiov,

                          unsigned int offset, unsigned int nob)
 {
        int     rc;
                          unsigned int offset, unsigned int nob)
 {
        int     rc;


@@ -2113,7 +2113,7 @@ kgnilnd_send(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg)
        int               target_is_router = lntmsg->msg_target_is_router;
        int               routing = lntmsg->msg_routing;
        unsigned int      niov = lntmsg->msg_niov;
        int               target_is_router = lntmsg->msg_target_is_router;
        int               routing = lntmsg->msg_routing;
        unsigned int      niov = lntmsg->msg_niov;

-       struct iovec     *iov = lntmsg->msg_iov;
+       struct kvec      *iov = lntmsg->msg_iov;

        lnet_kiov_t      *kiov = lntmsg->msg_kiov;
        unsigned int      offset = lntmsg->msg_offset;
        unsigned int      nob = lntmsg->msg_len;
        lnet_kiov_t      *kiov = lntmsg->msg_kiov;
        unsigned int      offset = lntmsg->msg_offset;
        unsigned int      nob = lntmsg->msg_len;


@@ -2282,7 +2282,7 @@ kgnilnd_setup_rdma(lnet_ni_t *ni, kgn_rx_t *rx, lnet_msg_t *lntmsg, int mlen)
        kgn_conn_t    *conn = rx->grx_conn;
        kgn_msg_t     *rxmsg = rx->grx_msg;
        unsigned int   niov = lntmsg->msg_niov;
        kgn_conn_t    *conn = rx->grx_conn;
        kgn_msg_t     *rxmsg = rx->grx_msg;
        unsigned int   niov = lntmsg->msg_niov;

-       struct iovec  *iov = lntmsg->msg_iov;
+       struct kvec   *iov = lntmsg->msg_iov;

        lnet_kiov_t   *kiov = lntmsg->msg_kiov;
        unsigned int   offset = lntmsg->msg_offset;
        unsigned int   nob = lntmsg->msg_len;
        lnet_kiov_t   *kiov = lntmsg->msg_kiov;
        unsigned int   offset = lntmsg->msg_offset;
        unsigned int   nob = lntmsg->msg_len;


@@ -2431,7 +2431,7 @@ kgnilnd_eager_recv(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg,
 int
 kgnilnd_recv(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg,
             int delayed, unsigned int niov,
 int
 kgnilnd_recv(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg,
             int delayed, unsigned int niov,

-            struct iovec *iov, lnet_kiov_t *kiov,
+            struct kvec *iov, lnet_kiov_t *kiov,

             unsigned int offset, unsigned int mlen, unsigned int rlen)
 {
        kgn_rx_t    *rx = private;
             unsigned int offset, unsigned int mlen, unsigned int rlen)
 {
        kgn_rx_t    *rx = private;

diff --git a/lnet/klnds/o2iblnd/o2iblnd.h b/lnet/klnds/o2iblnd/o2iblnd.h
index bdb7ac5..593108e 100644 (file)
--- a/lnet/klnds/o2iblnd/o2iblnd.h
+++ b/lnet/klnds/o2iblnd/o2iblnd.h
@@ -1120,6 +1120,6 @@ int  kiblnd_post_rx (kib_rx_t *rx, int credit);
 
 int  kiblnd_send(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg);
 int  kiblnd_recv(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg, int delayed,
 
 int  kiblnd_send(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg);
 int  kiblnd_recv(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg, int delayed,

-                 unsigned int niov, struct iovec *iov, lnet_kiov_t *kiov,
+                unsigned int niov, struct kvec *iov, lnet_kiov_t *kiov,

                  unsigned int offset, unsigned int mlen, unsigned int rlen);
 
                  unsigned int offset, unsigned int mlen, unsigned int rlen);
 

diff --git a/lnet/klnds/o2iblnd/o2iblnd_cb.c b/lnet/klnds/o2iblnd/o2iblnd_cb.c
index ff64291..8196b1b 100644 (file)
--- a/lnet/klnds/o2iblnd/o2iblnd_cb.c
+++ b/lnet/klnds/o2iblnd/o2iblnd_cb.c
@@ -668,7 +668,7 @@ kiblnd_map_tx(lnet_ni_t *ni, kib_tx_t *tx, kib_rdma_desc_t *rd, int nfrags)
 
 static int
 kiblnd_setup_rd_iov(lnet_ni_t *ni, kib_tx_t *tx, kib_rdma_desc_t *rd,
 
 static int
 kiblnd_setup_rd_iov(lnet_ni_t *ni, kib_tx_t *tx, kib_rdma_desc_t *rd,

-                    unsigned int niov, struct iovec *iov, int offset, int nob)
+                   unsigned int niov, struct kvec *iov, int offset, int nob)

 {
         kib_net_t          *net = ni->ni_data;
         struct page        *page;
 {
         kib_net_t          *net = ni->ni_data;
         struct page        *page;


@@ -1433,7 +1433,7 @@ kiblnd_send (lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg)
        int               target_is_router = lntmsg->msg_target_is_router;
        int               routing = lntmsg->msg_routing;
        unsigned int      payload_niov = lntmsg->msg_niov;
        int               target_is_router = lntmsg->msg_target_is_router;
        int               routing = lntmsg->msg_routing;
        unsigned int      payload_niov = lntmsg->msg_niov;

-       struct iovec     *payload_iov = lntmsg->msg_iov;
+       struct kvec      *payload_iov = lntmsg->msg_iov;

        lnet_kiov_t      *payload_kiov = lntmsg->msg_kiov;
        unsigned int      payload_offset = lntmsg->msg_offset;
        unsigned int      payload_nob = lntmsg->msg_len;
        lnet_kiov_t      *payload_kiov = lntmsg->msg_kiov;
        unsigned int      payload_offset = lntmsg->msg_offset;
        unsigned int      payload_nob = lntmsg->msg_len;


@@ -1599,7 +1599,7 @@ kiblnd_reply (lnet_ni_t *ni, kib_rx_t *rx, lnet_msg_t *lntmsg)
 {
         lnet_process_id_t target = lntmsg->msg_target;
         unsigned int      niov = lntmsg->msg_niov;
 {
         lnet_process_id_t target = lntmsg->msg_target;
         unsigned int      niov = lntmsg->msg_niov;

-        struct iovec     *iov = lntmsg->msg_iov;
+       struct kvec      *iov = lntmsg->msg_iov;

         lnet_kiov_t      *kiov = lntmsg->msg_kiov;
         unsigned int      offset = lntmsg->msg_offset;
         unsigned int      nob = lntmsg->msg_len;
         lnet_kiov_t      *kiov = lntmsg->msg_kiov;
         unsigned int      offset = lntmsg->msg_offset;
         unsigned int      nob = lntmsg->msg_len;


@@ -1657,9 +1657,9 @@ kiblnd_reply (lnet_ni_t *ni, kib_rx_t *rx, lnet_msg_t *lntmsg)
 }
 
 int
 }
 
 int

-kiblnd_recv (lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg, int delayed,
-             unsigned int niov, struct iovec *iov, lnet_kiov_t *kiov,
-             unsigned int offset, unsigned int mlen, unsigned int rlen)
+kiblnd_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)

 {
         kib_rx_t    *rx = private;
         kib_msg_t   *rxmsg = rx->rx_msg;
 {
         kib_rx_t    *rx = private;
         kib_msg_t   *rxmsg = rx->rx_msg;

diff --git a/lnet/klnds/socklnd/socklnd.h b/lnet/klnds/socklnd/socklnd.h
index b0e9c93..4065ef3 100644 (file)
--- a/lnet/klnds/socklnd/socklnd.h
+++ b/lnet/klnds/socklnd/socklnd.h
@@ -106,7 +106,7 @@ typedef struct                                  /* per scheduler state */
        struct page             *kss_rx_scratch_pgs[LNET_MAX_IOV];
 #endif
 #if !SOCKNAL_SINGLE_FRAG_TX || !SOCKNAL_SINGLE_FRAG_RX
        struct page             *kss_rx_scratch_pgs[LNET_MAX_IOV];
 #endif
 #if !SOCKNAL_SINGLE_FRAG_TX || !SOCKNAL_SINGLE_FRAG_RX

-       struct iovec            kss_scratch_iov[LNET_MAX_IOV];
+       struct kvec             kss_scratch_iov[LNET_MAX_IOV];

 #endif
 } ksock_sched_t;
 
 #endif
 } ksock_sched_t;
 


@@ -259,12 +259,12 @@ typedef struct
 #define SOCKNAL_INIT_ALL        2
 
 /* A packet just assembled for transmission is represented by 1 or more
 #define SOCKNAL_INIT_ALL        2
 
 /* A packet just assembled for transmission is represented by 1 or more

- * struct iovec fragments (the first frag contains the portals header),
+ * struct kvec fragments (the first frag contains the portals header),

  * followed by 0 or more lnet_kiov_t fragments.
  *
  * followed by 0 or more lnet_kiov_t fragments.
  *

- * On the receive side, initially 1 struct iovec fragment is posted for
+ * On the receive side, initially 1 struct kvec fragment is posted for

  * receive (the header).  Once the header has been received, the payload is
  * receive (the header).  Once the header has been received, the payload is

- * received into either struct iovec or lnet_kiov_t fragments, depending on
+ * received into either struct kvec or lnet_kiov_t fragments, depending on

  * what the header matched or whether the message needs forwarding. */
 
 struct ksock_conn;                              /* forward ref */
  * what the header matched or whether the message needs forwarding. */
 
 struct ksock_conn;                              /* forward ref */


@@ -279,8 +279,8 @@ typedef struct                                  /* transmit packet */
        atomic_t       tx_refcount;    /* tx reference count */
        int            tx_nob;         /* # packet bytes */
        int            tx_resid;       /* residual bytes */
        atomic_t       tx_refcount;    /* tx reference count */
        int            tx_nob;         /* # packet bytes */
        int            tx_resid;       /* residual bytes */

-        int            tx_niov;        /* # packet iovec frags */
-        struct iovec  *tx_iov;         /* packet iovec frags */
+       int            tx_niov;        /* # packet kvec frags */
+       struct kvec  *tx_iov;         /* packet kvec frags */

         int            tx_nkiov;       /* # packet page frags */
         unsigned short tx_zc_aborted;  /* aborted ZC request */
         unsigned short tx_zc_capable:1; /* payload is large enough for ZC */
         int            tx_nkiov;       /* # packet page frags */
         unsigned short tx_zc_aborted;  /* aborted ZC request */
         unsigned short tx_zc_capable:1; /* payload is large enough for ZC */


@@ -294,11 +294,11 @@ typedef struct                                  /* transmit packet */
         int            tx_desc_size;   /* size of this descriptor */
         union {
                 struct {
         int            tx_desc_size;   /* size of this descriptor */
         union {
                 struct {

-                        struct iovec iov;       /* virt hdr */
-                        lnet_kiov_t  kiov[0];   /* paged payload */
+                       struct kvec iov;        /* virt hdr */
+                       lnet_kiov_t kiov[0];    /* paged payload */

                 }                  paged;
                 struct {
                 }                  paged;
                 struct {

-                        struct iovec iov[1];    /* virt hdr + payload */
+                       struct kvec iov[1];     /* virt hdr + payload */

                 }                  virt;
         }                       tx_frags;
 } ksock_tx_t;
                 }                  virt;
         }                       tx_frags;
 } ksock_tx_t;


@@ -310,7 +310,7 @@ typedef struct                                  /* transmit packet */
 /* space for the rx frag descriptors; we either read a single contiguous
  * header, or up to LNET_MAX_IOV frags of payload of either type. */
 typedef union {
 /* space for the rx frag descriptors; we either read a single contiguous
  * header, or up to LNET_MAX_IOV frags of payload of either type. */
 typedef union {

-        struct iovec     iov[LNET_MAX_IOV];
+       struct kvec     iov[LNET_MAX_IOV];

         lnet_kiov_t      kiov[LNET_MAX_IOV];
 } ksock_rxiovspace_t;
 
         lnet_kiov_t      kiov[LNET_MAX_IOV];
 } ksock_rxiovspace_t;
 


@@ -353,8 +353,8 @@ typedef struct ksock_conn
         __u8                  ksnc_rx_state;    /* what is being read */
         int                   ksnc_rx_nob_left; /* # bytes to next hdr/body */
         int                   ksnc_rx_nob_wanted; /* bytes actually wanted */
         __u8                  ksnc_rx_state;    /* what is being read */
         int                   ksnc_rx_nob_left; /* # bytes to next hdr/body */
         int                   ksnc_rx_nob_wanted; /* bytes actually wanted */

-        int                   ksnc_rx_niov;     /* # iovec frags */
-        struct iovec         *ksnc_rx_iov;      /* the iovec frags */
+       int                   ksnc_rx_niov;     /* # kvec frags */
+       struct kvec          *ksnc_rx_iov;      /* the kvec frags */

         int                   ksnc_rx_nkiov;    /* # page frags */
         lnet_kiov_t          *ksnc_rx_kiov;     /* the page frags */
         ksock_rxiovspace_t    ksnc_rx_iov_space;/* space for frag descriptors */
         int                   ksnc_rx_nkiov;    /* # page frags */
         lnet_kiov_t          *ksnc_rx_kiov;     /* the page frags */
         ksock_rxiovspace_t    ksnc_rx_iov_space;/* space for frag descriptors */


@@ -614,9 +614,9 @@ int ksocknal_startup (lnet_ni_t *ni);
 void ksocknal_shutdown (lnet_ni_t *ni);
 int ksocknal_ctl(lnet_ni_t *ni, unsigned int cmd, void *arg);
 int ksocknal_send (lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg);
 void ksocknal_shutdown (lnet_ni_t *ni);
 int ksocknal_ctl(lnet_ni_t *ni, unsigned int cmd, void *arg);
 int ksocknal_send (lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg);

-int ksocknal_recv(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg, 
-                  int delayed, unsigned int niov, 
-                  struct iovec *iov, lnet_kiov_t *kiov,
+int ksocknal_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);
 int ksocknal_accept(lnet_ni_t *ni, struct socket *sock);
 
                   unsigned int offset, unsigned int mlen, unsigned int rlen);
 int ksocknal_accept(lnet_ni_t *ni, struct socket *sock);
 

diff --git a/lnet/klnds/socklnd/socklnd_cb.c b/lnet/klnds/socklnd/socklnd_cb.c
index df18aa5..e89ccb9 100644 (file)
--- a/lnet/klnds/socklnd/socklnd_cb.c
+++ b/lnet/klnds/socklnd/socklnd_cb.c
@@ -110,7 +110,7 @@ ksocknal_free_tx (ksock_tx_t *tx)
 static int
 ksocknal_send_iov (ksock_conn_t *conn, ksock_tx_t *tx)
 {
 static int
 ksocknal_send_iov (ksock_conn_t *conn, ksock_tx_t *tx)
 {

-        struct iovec  *iov = tx->tx_iov;
+       struct kvec *iov = tx->tx_iov;

         int    nob;
         int    rc;
 
         int    nob;
         int    rc;
 


@@ -251,7 +251,7 @@ ksocknal_transmit(ksock_conn_t *conn, ksock_tx_t *tx)
 static int
 ksocknal_recv_iov (ksock_conn_t *conn)
 {
 static int
 ksocknal_recv_iov (ksock_conn_t *conn)
 {

-        struct iovec *iov = conn->ksnc_rx_iov;
+       struct kvec *iov = conn->ksnc_rx_iov;

         int     nob;
         int     rc;
 
         int     nob;
         int     rc;
 


@@ -927,7 +927,7 @@ ksocknal_send(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg)
         int               type = lntmsg->msg_type;
         lnet_process_id_t target = lntmsg->msg_target;
         unsigned int      payload_niov = lntmsg->msg_niov;
         int               type = lntmsg->msg_type;
         lnet_process_id_t target = lntmsg->msg_target;
         unsigned int      payload_niov = lntmsg->msg_niov;

-        struct iovec     *payload_iov = lntmsg->msg_iov;
+       struct kvec *payload_iov = lntmsg->msg_iov;

         lnet_kiov_t      *payload_kiov = lntmsg->msg_kiov;
         unsigned int      payload_offset = lntmsg->msg_offset;
         unsigned int      payload_nob = lntmsg->msg_len;
         lnet_kiov_t      *payload_kiov = lntmsg->msg_kiov;
         unsigned int      payload_offset = lntmsg->msg_offset;
         unsigned int      payload_nob = lntmsg->msg_len;


@@ -1048,7 +1048,7 @@ ksocknal_new_packet (ksock_conn_t *conn, int nob_to_skip)
                case  KSOCK_PROTO_V2:
                case  KSOCK_PROTO_V3:
                         conn->ksnc_rx_state = SOCKNAL_RX_KSM_HEADER;
                case  KSOCK_PROTO_V2:
                case  KSOCK_PROTO_V3:
                         conn->ksnc_rx_state = SOCKNAL_RX_KSM_HEADER;

-                        conn->ksnc_rx_iov = (struct iovec *)&conn->ksnc_rx_iov_space;
+                       conn->ksnc_rx_iov = (struct kvec *)&conn->ksnc_rx_iov_space;

                         conn->ksnc_rx_iov[0].iov_base = (char *)&conn->ksnc_msg;
 
                         conn->ksnc_rx_nob_wanted = offsetof(ksock_msg_t, ksm_u);
                         conn->ksnc_rx_iov[0].iov_base = (char *)&conn->ksnc_msg;
 
                         conn->ksnc_rx_nob_wanted = offsetof(ksock_msg_t, ksm_u);


@@ -1062,7 +1062,7 @@ ksocknal_new_packet (ksock_conn_t *conn, int nob_to_skip)
                         conn->ksnc_rx_nob_wanted = sizeof(lnet_hdr_t);
                         conn->ksnc_rx_nob_left = sizeof(lnet_hdr_t);
 
                         conn->ksnc_rx_nob_wanted = sizeof(lnet_hdr_t);
                         conn->ksnc_rx_nob_left = sizeof(lnet_hdr_t);
 

-                        conn->ksnc_rx_iov = (struct iovec *)&conn->ksnc_rx_iov_space;
+                       conn->ksnc_rx_iov = (struct kvec *)&conn->ksnc_rx_iov_space;

                         conn->ksnc_rx_iov[0].iov_base = (char *)&conn->ksnc_msg.ksm_u.lnetmsg;
                         conn->ksnc_rx_iov[0].iov_len  = sizeof (lnet_hdr_t);
                         break;
                         conn->ksnc_rx_iov[0].iov_base = (char *)&conn->ksnc_msg.ksm_u.lnetmsg;
                         conn->ksnc_rx_iov[0].iov_len  = sizeof (lnet_hdr_t);
                         break;


@@ -1083,7 +1083,7 @@ ksocknal_new_packet (ksock_conn_t *conn, int nob_to_skip)
 
         conn->ksnc_rx_state = SOCKNAL_RX_SLOP;
         conn->ksnc_rx_nob_left = nob_to_skip;
 
         conn->ksnc_rx_state = SOCKNAL_RX_SLOP;
         conn->ksnc_rx_nob_left = nob_to_skip;

-        conn->ksnc_rx_iov = (struct iovec *)&conn->ksnc_rx_iov_space;
+       conn->ksnc_rx_iov = (struct kvec *)&conn->ksnc_rx_iov_space;

         skipped = 0;
         niov = 0;
 
         skipped = 0;
         niov = 0;
 


@@ -1097,7 +1097,7 @@ ksocknal_new_packet (ksock_conn_t *conn, int nob_to_skip)
                 nob_to_skip -=nob;
 
         } while (nob_to_skip != 0 &&    /* mustn't overflow conn's rx iov */
                 nob_to_skip -=nob;
 
         } while (nob_to_skip != 0 &&    /* mustn't overflow conn's rx iov */

-                 niov < sizeof(conn->ksnc_rx_iov_space) / sizeof (struct iovec));
+                niov < sizeof(conn->ksnc_rx_iov_space) / sizeof(struct kvec));

 
         conn->ksnc_rx_niov = niov;
         conn->ksnc_rx_kiov = NULL;
 
         conn->ksnc_rx_niov = niov;
         conn->ksnc_rx_kiov = NULL;


@@ -1215,7 +1215,7 @@ ksocknal_process_receive (ksock_conn_t *conn)
                 conn->ksnc_rx_nob_wanted = sizeof(ksock_lnet_msg_t);
                 conn->ksnc_rx_nob_left = sizeof(ksock_lnet_msg_t);
 
                 conn->ksnc_rx_nob_wanted = sizeof(ksock_lnet_msg_t);
                 conn->ksnc_rx_nob_left = sizeof(ksock_lnet_msg_t);
 

-                conn->ksnc_rx_iov = (struct iovec *)&conn->ksnc_rx_iov_space;
+               conn->ksnc_rx_iov = (struct kvec *)&conn->ksnc_rx_iov_space;

                 conn->ksnc_rx_iov[0].iov_base = (char *)&conn->ksnc_msg.ksm_u.lnetmsg;
                 conn->ksnc_rx_iov[0].iov_len  = sizeof(ksock_lnet_msg_t);
 
                 conn->ksnc_rx_iov[0].iov_base = (char *)&conn->ksnc_msg.ksm_u.lnetmsg;
                 conn->ksnc_rx_iov[0].iov_len  = sizeof(ksock_lnet_msg_t);
 


@@ -1314,7 +1314,7 @@ ksocknal_process_receive (ksock_conn_t *conn)
 
 int
 ksocknal_recv (lnet_ni_t *ni, void *private, lnet_msg_t *msg, int delayed,
 
 int
 ksocknal_recv (lnet_ni_t *ni, void *private, lnet_msg_t *msg, int delayed,

-               unsigned int niov, struct iovec *iov, lnet_kiov_t *kiov,
+              unsigned int niov, struct kvec *iov, lnet_kiov_t *kiov,

                unsigned int offset, unsigned int mlen, unsigned int rlen)
 {
         ksock_conn_t  *conn = (ksock_conn_t *)private;
                unsigned int offset, unsigned int mlen, unsigned int rlen)
 {
         ksock_conn_t  *conn = (ksock_conn_t *)private;

diff --git a/lnet/klnds/socklnd/socklnd_lib.c b/lnet/klnds/socklnd/socklnd_lib.c
index e17f475..b59e685 100644 (file)
--- a/lnet/klnds/socklnd/socklnd_lib.c
+++ b/lnet/klnds/socklnd/socklnd_lib.c
@@ -398,12 +398,12 @@ ksocknal_lib_send_iov(ksock_conn_t *conn, ksock_tx_t *tx)
 
        {
 #if SOCKNAL_SINGLE_FRAG_TX
 
        {
 #if SOCKNAL_SINGLE_FRAG_TX

-               struct iovec    scratch;
-               struct iovec   *scratchiov = &scratch;
-               unsigned int    niov = 1;
+               struct kvec scratch;
+               struct kvec *scratchiov = &scratch;
+               unsigned int niov = 1;

 #else
 #else

-                struct iovec   *scratchiov = conn->ksnc_scheduler->kss_scratch_iov;
-               unsigned int    niov = tx->tx_niov;
+               struct kvec *scratchiov = conn->ksnc_scheduler->kss_scratch_iov;
+               unsigned int niov = tx->tx_niov;

 #endif
                struct msghdr msg = { .msg_flags = MSG_DONTWAIT };
                 int  i;
 #endif
                struct msghdr msg = { .msg_flags = MSG_DONTWAIT };
                 int  i;


@@ -417,8 +417,7 @@ ksocknal_lib_send_iov(ksock_conn_t *conn, ksock_tx_t *tx)
                    nob < tx->tx_resid)
                        msg.msg_flags |= MSG_MORE;
 
                    nob < tx->tx_resid)
                        msg.msg_flags |= MSG_MORE;
 

-               rc = kernel_sendmsg(sock, &msg, (struct kvec *)scratchiov,
-                                   niov, nob);
+               rc = kernel_sendmsg(sock, &msg, scratchiov, niov, nob);

        }
        return rc;
 }
        }
        return rc;
 }


@@ -460,14 +459,14 @@ ksocknal_lib_send_kiov(ksock_conn_t *conn, ksock_tx_t *tx)
                 }
         } else {
 #if SOCKNAL_SINGLE_FRAG_TX || !SOCKNAL_RISK_KMAP_DEADLOCK
                 }
         } else {
 #if SOCKNAL_SINGLE_FRAG_TX || !SOCKNAL_RISK_KMAP_DEADLOCK

-               struct iovec    scratch;
-               struct iovec   *scratchiov = &scratch;
+               struct kvec     scratch;
+               struct kvec   *scratchiov = &scratch;

                unsigned int    niov = 1;
 #else
 #ifdef CONFIG_HIGHMEM
 #warning "XXX risk of kmap deadlock on multiple frags..."
 #endif
                unsigned int    niov = 1;
 #else
 #ifdef CONFIG_HIGHMEM
 #warning "XXX risk of kmap deadlock on multiple frags..."
 #endif

-               struct iovec *scratchiov = conn->ksnc_scheduler->kss_scratch_iov;
+               struct kvec *scratchiov = conn->ksnc_scheduler->kss_scratch_iov;

                unsigned int  niov = tx->tx_nkiov;
 #endif
                struct msghdr msg = { .msg_flags = MSG_DONTWAIT };
                unsigned int  niov = tx->tx_nkiov;
 #endif
                struct msghdr msg = { .msg_flags = MSG_DONTWAIT };


@@ -483,7 +482,7 @@ ksocknal_lib_send_kiov(ksock_conn_t *conn, ksock_tx_t *tx)
                    nob < tx->tx_resid)
                        msg.msg_flags |= MSG_MORE;
 
                    nob < tx->tx_resid)
                        msg.msg_flags |= MSG_MORE;
 

-               rc = kernel_sendmsg(sock, &msg, (struct kvec *)scratchiov, niov, nob);
+               rc = kernel_sendmsg(sock, &msg, scratchiov, niov, nob);

 
                for (i = 0; i < niov; i++)
                        kunmap(kiov[i].kiov_page);
 
                for (i = 0; i < niov; i++)
                        kunmap(kiov[i].kiov_page);


@@ -513,14 +512,14 @@ int
 ksocknal_lib_recv_iov (ksock_conn_t *conn)
 {
 #if SOCKNAL_SINGLE_FRAG_RX
 ksocknal_lib_recv_iov (ksock_conn_t *conn)
 {
 #if SOCKNAL_SINGLE_FRAG_RX

-       struct iovec  scratch;
-       struct iovec *scratchiov = &scratch;
+       struct kvec  scratch;
+       struct kvec *scratchiov = &scratch;

        unsigned int  niov = 1;
 #else
        unsigned int  niov = 1;
 #else

-       struct iovec *scratchiov = conn->ksnc_scheduler->kss_scratch_iov;
+       struct kvec *scratchiov = conn->ksnc_scheduler->kss_scratch_iov;

        unsigned int  niov = conn->ksnc_rx_niov;
 #endif
        unsigned int  niov = conn->ksnc_rx_niov;
 #endif

-       struct iovec *iov = conn->ksnc_rx_iov;
+       struct kvec *iov = conn->ksnc_rx_iov;

        struct msghdr msg = {
                .msg_flags      = 0
        };
        struct msghdr msg = {
                .msg_flags      = 0
        };


@@ -541,8 +540,8 @@ ksocknal_lib_recv_iov (ksock_conn_t *conn)
         }
         LASSERT (nob <= conn->ksnc_rx_nob_wanted);
 
         }
         LASSERT (nob <= conn->ksnc_rx_nob_wanted);
 

-       rc = kernel_recvmsg(conn->ksnc_sock, &msg,
-               (struct kvec *)scratchiov, niov, nob, MSG_DONTWAIT);
+       rc = kernel_recvmsg(conn->ksnc_sock, &msg, scratchiov, niov, nob,
+                           MSG_DONTWAIT);

 
         saved_csum = 0;
         if (conn->ksnc_proto == &ksocknal_protocol_v2x) {
 
         saved_csum = 0;
         if (conn->ksnc_proto == &ksocknal_protocol_v2x) {


@@ -579,7 +578,7 @@ ksocknal_lib_kiov_vunmap(void *addr)
 
 static void *
 ksocknal_lib_kiov_vmap(lnet_kiov_t *kiov, int niov,
 
 static void *
 ksocknal_lib_kiov_vmap(lnet_kiov_t *kiov, int niov,

-                       struct iovec *iov, struct page **pages)
+                      struct kvec *iov, struct page **pages)

 {
         void             *addr;
         int               nob;
 {
         void             *addr;
         int               nob;


@@ -618,15 +617,15 @@ int
 ksocknal_lib_recv_kiov (ksock_conn_t *conn)
 {
 #if SOCKNAL_SINGLE_FRAG_RX || !SOCKNAL_RISK_KMAP_DEADLOCK
 ksocknal_lib_recv_kiov (ksock_conn_t *conn)
 {
 #if SOCKNAL_SINGLE_FRAG_RX || !SOCKNAL_RISK_KMAP_DEADLOCK

-        struct iovec   scratch;
-        struct iovec  *scratchiov = &scratch;
+       struct kvec   scratch;
+       struct kvec  *scratchiov = &scratch;

         struct page  **pages      = NULL;
         unsigned int   niov       = 1;
 #else
 #ifdef CONFIG_HIGHMEM
 #warning "XXX risk of kmap deadlock on multiple frags..."
 #endif
         struct page  **pages      = NULL;
         unsigned int   niov       = 1;
 #else
 #ifdef CONFIG_HIGHMEM
 #warning "XXX risk of kmap deadlock on multiple frags..."
 #endif

-       struct iovec  *scratchiov = conn->ksnc_scheduler->kss_scratch_iov;
+       struct kvec  *scratchiov = conn->ksnc_scheduler->kss_scratch_iov;

        struct page  **pages      = conn->ksnc_scheduler->kss_rx_scratch_pgs;
        unsigned int   niov       = conn->ksnc_rx_nkiov;
 #endif
        struct page  **pages      = conn->ksnc_scheduler->kss_rx_scratch_pgs;
        unsigned int   niov       = conn->ksnc_rx_nkiov;
 #endif


@@ -660,8 +659,8 @@ ksocknal_lib_recv_kiov (ksock_conn_t *conn)
 
        LASSERT (nob <= conn->ksnc_rx_nob_wanted);
 
 
        LASSERT (nob <= conn->ksnc_rx_nob_wanted);
 

-       rc = kernel_recvmsg(conn->ksnc_sock, &msg,
-                       (struct kvec *)scratchiov, n, nob, MSG_DONTWAIT);
+       rc = kernel_recvmsg(conn->ksnc_sock, &msg, scratchiov, n, nob,
+                           MSG_DONTWAIT);

 
         if (conn->ksnc_msg.ksm_csum != 0) {
                 for (i = 0, sum = rc; sum > 0; i++, sum -= fragnob) {
 
         if (conn->ksnc_msg.ksm_csum != 0) {
                 for (i = 0, sum = rc; sum > 0; i++, sum -= fragnob) {

diff --git a/lnet/lnet/lib-move.c b/lnet/lnet/lib-move.c
index ee2ab6f..17a62c8 100644 (file)
--- a/lnet/lnet/lib-move.c
+++ b/lnet/lnet/lib-move.c
@@ -156,7 +156,7 @@ fail_peer (lnet_nid_t nid, int outgoing)
 }
 
 unsigned int
 }
 
 unsigned int

-lnet_iov_nob (unsigned int niov, struct iovec *iov)
+lnet_iov_nob(unsigned int niov, struct kvec *iov)

 {
         unsigned int nob = 0;
 
 {
         unsigned int nob = 0;
 


@@ -169,9 +169,9 @@ lnet_iov_nob (unsigned int niov, struct iovec *iov)
 EXPORT_SYMBOL(lnet_iov_nob);
 
 void
 EXPORT_SYMBOL(lnet_iov_nob);
 
 void

-lnet_copy_iov2iov (unsigned int ndiov, struct iovec *diov, unsigned int doffset,
-                   unsigned int nsiov, struct iovec *siov, unsigned int soffset,
-                   unsigned int nob)
+lnet_copy_iov2iov(unsigned int ndiov, struct kvec *diov, unsigned int doffset,
+                 unsigned int nsiov, struct kvec *siov, unsigned int soffset,
+                 unsigned int nob)

 {
         /* NB diov, siov are READ-ONLY */
         unsigned int  this_nob;
 {
         /* NB diov, siov are READ-ONLY */
         unsigned int  this_nob;


@@ -228,9 +228,9 @@ lnet_copy_iov2iov (unsigned int ndiov, struct iovec *diov, unsigned int doffset,
 EXPORT_SYMBOL(lnet_copy_iov2iov);
 
 int
 EXPORT_SYMBOL(lnet_copy_iov2iov);
 
 int

-lnet_extract_iov (int dst_niov, struct iovec *dst,
-                  int src_niov, struct iovec *src,
-                  unsigned int offset, unsigned int len)
+lnet_extract_iov(int dst_niov, struct kvec *dst,
+                int src_niov, struct kvec *src,
+                unsigned int offset, unsigned int len)

 {
         /* Initialise 'dst' to the subset of 'src' starting at 'offset',
          * for exactly 'len' bytes, and return the number of entries.
 {
         /* Initialise 'dst' to the subset of 'src' starting at 'offset',
          * for exactly 'len' bytes, and return the number of entries.


@@ -276,7 +276,7 @@ EXPORT_SYMBOL(lnet_extract_iov);
 
 
 unsigned int
 
 
 unsigned int

-lnet_kiov_nob (unsigned int niov, lnet_kiov_t *kiov)
+lnet_kiov_nob(unsigned int niov, lnet_kiov_t *kiov)

 {
         unsigned int  nob = 0;
 
 {
         unsigned int  nob = 0;
 


@@ -289,9 +289,9 @@ lnet_kiov_nob (unsigned int niov, lnet_kiov_t *kiov)
 EXPORT_SYMBOL(lnet_kiov_nob);
 
 void
 EXPORT_SYMBOL(lnet_kiov_nob);
 
 void

-lnet_copy_kiov2kiov (unsigned int ndiov, lnet_kiov_t *diov, unsigned int doffset,
-                     unsigned int nsiov, lnet_kiov_t *siov, unsigned int soffset,
-                     unsigned int nob)
+lnet_copy_kiov2kiov(unsigned int ndiov, lnet_kiov_t *diov, unsigned int doffset,
+                   unsigned int nsiov, lnet_kiov_t *siov, unsigned int soffset,
+                   unsigned int nob)

 {
        /* NB diov, siov are READ-ONLY */
        unsigned int    this_nob;
 {
        /* NB diov, siov are READ-ONLY */
        unsigned int    this_nob;


@@ -371,7 +371,7 @@ lnet_copy_kiov2kiov (unsigned int ndiov, lnet_kiov_t *diov, unsigned int doffset
 EXPORT_SYMBOL(lnet_copy_kiov2kiov);
 
 void
 EXPORT_SYMBOL(lnet_copy_kiov2kiov);
 
 void

-lnet_copy_kiov2iov (unsigned int niov, struct iovec *iov, unsigned int iovoffset,
+lnet_copy_kiov2iov (unsigned int niov, struct kvec *iov, unsigned int iovoffset,

                     unsigned int nkiov, lnet_kiov_t *kiov, unsigned int kiovoffset,
                     unsigned int nob)
 {
                     unsigned int nkiov, lnet_kiov_t *kiov, unsigned int kiovoffset,
                     unsigned int nob)
 {


@@ -441,9 +441,9 @@ lnet_copy_kiov2iov (unsigned int niov, struct iovec *iov, unsigned int iovoffset
 EXPORT_SYMBOL(lnet_copy_kiov2iov);
 
 void
 EXPORT_SYMBOL(lnet_copy_kiov2iov);
 
 void

-lnet_copy_iov2kiov (unsigned int nkiov, lnet_kiov_t *kiov, unsigned int kiovoffset,
-                    unsigned int niov, struct iovec *iov, unsigned int iovoffset,
-                    unsigned int nob)
+lnet_copy_iov2kiov(unsigned int nkiov, lnet_kiov_t *kiov, unsigned int kiovoffset,
+                  unsigned int niov, struct kvec *iov, unsigned int iovoffset,
+                  unsigned int nob)

 {
        /* NB kiov, iov are READ-ONLY */
        unsigned int    this_nob;
 {
        /* NB kiov, iov are READ-ONLY */
        unsigned int    this_nob;


@@ -510,9 +510,9 @@ lnet_copy_iov2kiov (unsigned int nkiov, lnet_kiov_t *kiov, unsigned int kiovoffs
 EXPORT_SYMBOL(lnet_copy_iov2kiov);
 
 int
 EXPORT_SYMBOL(lnet_copy_iov2kiov);
 
 int

-lnet_extract_kiov (int dst_niov, lnet_kiov_t *dst,
-                   int src_niov, lnet_kiov_t *src,
-                   unsigned int offset, unsigned int len)
+lnet_extract_kiov(int dst_niov, lnet_kiov_t *dst,
+                 int src_niov, lnet_kiov_t *src,
+                 unsigned int offset, unsigned int len)

 {
         /* Initialise 'dst' to the subset of 'src' starting at 'offset',
          * for exactly 'len' bytes, and return the number of entries.
 {
         /* Initialise 'dst' to the subset of 'src' starting at 'offset',
          * for exactly 'len' bytes, and return the number of entries.


@@ -564,7 +564,7 @@ lnet_ni_recv(lnet_ni_t *ni, void *private, lnet_msg_t *msg, int delayed,
              unsigned int offset, unsigned int mlen, unsigned int rlen)
 {
        unsigned int  niov = 0;
              unsigned int offset, unsigned int mlen, unsigned int rlen)
 {
        unsigned int  niov = 0;

-       struct iovec *iov = NULL;
+       struct kvec *iov = NULL;

        lnet_kiov_t  *kiov = NULL;
        int           rc;
 
        lnet_kiov_t  *kiov = NULL;
        int           rc;
 

diff --git a/lnet/lnet/lo.c b/lnet/lnet/lo.c
index 721d6f8..7f3205a 100644 (file)
--- a/lnet/lnet/lo.c
+++ b/lnet/lnet/lo.c
@@ -47,7 +47,7 @@ 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,
 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,
+           struct kvec *iov, lnet_kiov_t *kiov,

             unsigned int offset, unsigned int mlen, unsigned int rlen)
 {
         lnet_msg_t *sendmsg = private;
             unsigned int offset, unsigned int mlen, unsigned int rlen)
 {
         lnet_msg_t *sendmsg = private;