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

[fs/lustre-release.git] / lnet / include / lnet / lib-lnet.h

diff --git a/lnet/include/lnet/lib-lnet.h b/lnet/include/lnet/lib-lnet.h
index 6dbcd35..d23e4b1 100644 (file)
--- a/lnet/include/lnet/lib-lnet.h
+++ b/lnet/include/lnet/lib-lnet.h
@@ -27,7 +27,7 @@
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, 2014, Intel Corporation.
+ * Copyright (c) 2012, 2015, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -457,14 +457,14 @@ extern lnet_ni_t *lnet_nid2ni_locked(lnet_nid_t nid, int cpt);
 extern lnet_ni_t *lnet_net2ni_locked(__u32 net, int cpt);
 extern lnet_ni_t *lnet_net2ni(__u32 net);
 
-int lnet_init(void);
-void lnet_fini(void);
+int lnet_lib_init(void);
+void lnet_lib_exit(void);
 
 extern int portal_rotor;
 
 int lnet_notify(lnet_ni_t *ni, lnet_nid_t peer, int alive, cfs_time_t when);
 void lnet_notify_locked(lnet_peer_t *lp, int notifylnd, int alive, cfs_time_t when);
-int lnet_add_route(__u32 net, unsigned int hops, lnet_nid_t gateway_nid,
+int lnet_add_route(__u32 net, __u32 hops, lnet_nid_t gateway_nid,
                   unsigned int priority);
 int lnet_check_routes(void);
 int lnet_del_route(__u32 net, lnet_nid_t gw_nid);
@@ -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);
 
-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);
-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,
-                   unsigned int nsiov, struct iovec *siov, unsigned int soffset,
+                  unsigned int nsiov, struct kvec *siov, 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_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)
 {
-        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_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)
 {
-        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);
 }
@@ -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)
 {
-        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);
 }