aboutsummaryrefslogtreecommitdiffstats
path: root/net/rds
diff options
context:
space:
mode:
Diffstat (limited to 'net/rds')
-rw-r--r--net/rds/rds.h7
-rw-r--r--net/rds/recv.c4
-rw-r--r--net/rds/send.c3
3 files changed, 6 insertions, 8 deletions
diff --git a/net/rds/rds.h b/net/rds/rds.h
index c2a5eef41343..c3f2855c3d84 100644
--- a/net/rds/rds.h
+++ b/net/rds/rds.h
@@ -702,8 +702,8 @@ void rds_inc_init(struct rds_incoming *inc, struct rds_connection *conn,
702void rds_inc_put(struct rds_incoming *inc); 702void rds_inc_put(struct rds_incoming *inc);
703void rds_recv_incoming(struct rds_connection *conn, __be32 saddr, __be32 daddr, 703void rds_recv_incoming(struct rds_connection *conn, __be32 saddr, __be32 daddr,
704 struct rds_incoming *inc, gfp_t gfp); 704 struct rds_incoming *inc, gfp_t gfp);
705int rds_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg, 705int rds_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,
706 size_t size, int msg_flags); 706 int msg_flags);
707void rds_clear_recv_queue(struct rds_sock *rs); 707void rds_clear_recv_queue(struct rds_sock *rs);
708int rds_notify_queue_get(struct rds_sock *rs, struct msghdr *msg); 708int rds_notify_queue_get(struct rds_sock *rs, struct msghdr *msg);
709void rds_inc_info_copy(struct rds_incoming *inc, 709void rds_inc_info_copy(struct rds_incoming *inc,
@@ -711,8 +711,7 @@ void rds_inc_info_copy(struct rds_incoming *inc,
711 __be32 saddr, __be32 daddr, int flip); 711 __be32 saddr, __be32 daddr, int flip);
712 712
713/* send.c */ 713/* send.c */
714int rds_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg, 714int rds_sendmsg(struct socket *sock, struct msghdr *msg, size_t payload_len);
715 size_t payload_len);
716void rds_send_reset(struct rds_connection *conn); 715void rds_send_reset(struct rds_connection *conn);
717int rds_send_xmit(struct rds_connection *conn); 716int rds_send_xmit(struct rds_connection *conn);
718struct sockaddr_in; 717struct sockaddr_in;
diff --git a/net/rds/recv.c b/net/rds/recv.c
index f9ec1acd801c..a00462b0d01d 100644
--- a/net/rds/recv.c
+++ b/net/rds/recv.c
@@ -395,8 +395,8 @@ static int rds_cmsg_recv(struct rds_incoming *inc, struct msghdr *msg)
395 return 0; 395 return 0;
396} 396}
397 397
398int rds_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg, 398int rds_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,
399 size_t size, int msg_flags) 399 int msg_flags)
400{ 400{
401 struct sock *sk = sock->sk; 401 struct sock *sk = sock->sk;
402 struct rds_sock *rs = rds_sk_to_rs(sk); 402 struct rds_sock *rs = rds_sk_to_rs(sk);
diff --git a/net/rds/send.c b/net/rds/send.c
index 42f65d4305c8..44672befc0ee 100644
--- a/net/rds/send.c
+++ b/net/rds/send.c
@@ -920,8 +920,7 @@ static int rds_cmsg_send(struct rds_sock *rs, struct rds_message *rm,
920 return ret; 920 return ret;
921} 921}
922 922
923int rds_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg, 923int rds_sendmsg(struct socket *sock, struct msghdr *msg, size_t payload_len)
924 size_t payload_len)
925{ 924{
926 struct sock *sk = sock->sk; 925 struct sock *sk = sock->sk;
927 struct rds_sock *rs = rds_sk_to_rs(sk); 926 struct rds_sock *rs = rds_sk_to_rs(sk);