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

[deliverable/linux.git] / drivers / staging / lustre / lnet / lnet / lo.c

diff --git a/drivers/staging/lustre/lnet/lnet/lo.c b/drivers/staging/lustre/lnet/lnet/lo.c
index 08402712a452cc697513fc2676f91659834092a2..cb213b8f51cf16303bcad470433e384e0eb2dbc1 100644 (file)
--- a/drivers/staging/lustre/lnet/lnet/lo.c
+++ b/drivers/staging/lustre/lnet/lnet/lo.c
@@ -42,36 +42,23 @@ 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)
+          int delayed, struct iov_iter *to, unsigned int rlen)
 {
        lnet_msg_t *sendmsg = private;
 
        if (lntmsg) {              /* not discarding */
-               if (sendmsg->msg_iov) {
-                       if (iov)
-                               lnet_copy_iov2iov(niov, iov, offset,
-                                                 sendmsg->msg_niov,
-                                                 sendmsg->msg_iov,
-                                                 sendmsg->msg_offset, mlen);
-                       else
-                               lnet_copy_iov2kiov(niov, kiov, offset,
-                                                  sendmsg->msg_niov,
-                                                  sendmsg->msg_iov,
-                                                  sendmsg->msg_offset, mlen);
-               } else {
-                       if (iov)
-                               lnet_copy_kiov2iov(niov, iov, offset,
-                                                  sendmsg->msg_niov,
-                                                  sendmsg->msg_kiov,
-                                                  sendmsg->msg_offset, mlen);
-                       else
-                               lnet_copy_kiov2kiov(niov, kiov, offset,
-                                                   sendmsg->msg_niov,
-                                                   sendmsg->msg_kiov,
-                                                   sendmsg->msg_offset, mlen);
-               }
+               if (sendmsg->msg_iov)
+                       lnet_copy_iov2iter(to,
+                                          sendmsg->msg_niov,
+                                          sendmsg->msg_iov,
+                                          sendmsg->msg_offset,
+                                          iov_iter_count(to));
+               else
+                       lnet_copy_kiov2iter(to,
+                                           sendmsg->msg_niov,
+                                           sendmsg->msg_kiov,
+                                           sendmsg->msg_offset,
+                                           iov_iter_count(to));
 
                lnet_finalize(ni, lntmsg, 0);
        }