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

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

diff --git a/drivers/staging/lustre/include/linux/lnet/lib-types.h b/drivers/staging/lustre/include/linux/lnet/lib-types.h
index 7967b013cbae9debaf06b29750937ec00457b6d5..640ff72753113180056e26eb5c9f07e12f1a9c75 100644 (file)
--- a/drivers/staging/lustre/include/linux/lnet/lib-types.h
+++ b/drivers/staging/lustre/include/linux/lnet/lib-types.h
@@ -220,10 +220,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,
-                       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_parse() has had to delay processing of this message