diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2014-11-20 09:21:14 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-11-24 05:16:43 -0500 |
commit | c310e72c89926e06138e4881f21e4c8da3e7ef18 (patch) | |
tree | cf40fae1e3639f0ff3607561c1e4fd484b7b53e9 /net/rds/rds.h | |
parent | 7424ce65065852bdf7a040bf2490da4a8fc4b464 (diff) |
rds: switch ->inc_copy_to_user() to passing iov_iter
instances get considerably simpler from that...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'net/rds/rds.h')
-rw-r--r-- | net/rds/rds.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/rds/rds.h b/net/rds/rds.h index 48f8ffc60f8f..b22dad91697c 100644 --- a/net/rds/rds.h +++ b/net/rds/rds.h | |||
@@ -431,8 +431,7 @@ struct rds_transport { | |||
431 | int (*xmit_rdma)(struct rds_connection *conn, struct rm_rdma_op *op); | 431 | int (*xmit_rdma)(struct rds_connection *conn, struct rm_rdma_op *op); |
432 | int (*xmit_atomic)(struct rds_connection *conn, struct rm_atomic_op *op); | 432 | int (*xmit_atomic)(struct rds_connection *conn, struct rm_atomic_op *op); |
433 | int (*recv)(struct rds_connection *conn); | 433 | int (*recv)(struct rds_connection *conn); |
434 | int (*inc_copy_to_user)(struct rds_incoming *inc, struct iovec *iov, | 434 | int (*inc_copy_to_user)(struct rds_incoming *inc, struct iov_iter *to); |
435 | size_t size); | ||
436 | void (*inc_free)(struct rds_incoming *inc); | 435 | void (*inc_free)(struct rds_incoming *inc); |
437 | 436 | ||
438 | int (*cm_handle_connect)(struct rdma_cm_id *cm_id, | 437 | int (*cm_handle_connect)(struct rdma_cm_id *cm_id, |
@@ -667,8 +666,7 @@ int rds_message_add_extension(struct rds_header *hdr, | |||
667 | int rds_message_next_extension(struct rds_header *hdr, | 666 | int rds_message_next_extension(struct rds_header *hdr, |
668 | unsigned int *pos, void *buf, unsigned int *buflen); | 667 | unsigned int *pos, void *buf, unsigned int *buflen); |
669 | int rds_message_add_rdma_dest_extension(struct rds_header *hdr, u32 r_key, u32 offset); | 668 | int rds_message_add_rdma_dest_extension(struct rds_header *hdr, u32 r_key, u32 offset); |
670 | int rds_message_inc_copy_to_user(struct rds_incoming *inc, | 669 | int rds_message_inc_copy_to_user(struct rds_incoming *inc, struct iov_iter *to); |
671 | struct iovec *first_iov, size_t size); | ||
672 | void rds_message_inc_free(struct rds_incoming *inc); | 670 | void rds_message_inc_free(struct rds_incoming *inc); |
673 | void rds_message_addref(struct rds_message *rm); | 671 | void rds_message_addref(struct rds_message *rm); |
674 | void rds_message_put(struct rds_message *rm); | 672 | void rds_message_put(struct rds_message *rm); |