Merge remote-tracking branch 'staging/staging-next'

[deliverable/linux.git] / drivers / staging / lustre / include / linux / lnet / lib-lnet.h

diff --git a/drivers/staging/lustre/include/linux/lnet/lib-lnet.h b/drivers/staging/lustre/include/linux/lnet/lib-lnet.h
index 513a8225f888d687992269e642c35971ce2d036b..a59c5e99cbd3ca4ec3e69b7f6396aa5b5254c24a 100644 (file)
--- a/drivers/staging/lustre/include/linux/lnet/lib-lnet.h
+++ b/drivers/staging/lustre/include/linux/lnet/lib-lnet.h
@@ -605,73 +605,20 @@ void lnet_counters_reset(void);
 
 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,
+                    int src_niov, const 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,
+                     int src_niov, const 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,
+void lnet_copy_iov2iter(struct iov_iter *to,
+                       unsigned int nsiov, const 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,
+void lnet_copy_kiov2iter(struct iov_iter *to,
+                        unsigned int nkiov, const 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, void *dest, unsigned int doffset,
-                  unsigned int nsiov, struct kvec *siov, unsigned int soffset,
-                  unsigned int nob)
-{
-       struct kvec diov = {/*.iov_base = */ dest, /*.iov_len = */ dlen};
-
-       lnet_copy_iov2iov(1, &diov, doffset,
-                         nsiov, siov, soffset, nob);
-}
-
-static inline void
-lnet_copy_kiov2flat(int dlen, void *dest, unsigned int doffset,
-                   unsigned int nsiov, lnet_kiov_t *skiov,
-                   unsigned int soffset, unsigned int nob)
-{
-       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 kvec *diov, unsigned int doffset,
-                  int slen, void *src, unsigned int soffset, unsigned int nob)
-{
-       struct kvec siov = {/*.iov_base = */ src, /*.iov_len = */slen};
-
-       lnet_copy_iov2iov(ndiov, diov, doffset,
-                         1, &siov, soffset, nob);
-}
-
-static inline void
-lnet_copy_flat2kiov(unsigned int ndiov, lnet_kiov_t *dkiov,
-                   unsigned int doffset, int slen, void *src,
-                   unsigned int soffset, unsigned int nob)
-{
-       struct kvec siov = {/* .iov_base = */ src, /* .iov_len = */ slen};
-
-       lnet_copy_iov2kiov(ndiov, dkiov, doffset,
-                          1, &siov, soffset, nob);
-}
 
 void lnet_me_unlink(lnet_me_t *me);