aboutsummaryrefslogtreecommitdiffstats
path: root/net/sctp
diff options
context:
space:
mode:
authorYing Xue <ying.xue@windriver.com>2015-03-02 02:37:48 -0500
committerDavid S. Miller <davem@davemloft.net>2015-03-02 13:06:31 -0500
commit1b784140474e4fc94281a49e96c67d29df0efbde (patch)
tree569e9813ae7ab79616849b117c6b50b3d6e4dabb /net/sctp
parent39a0295f901423e260a034ac7c3211ecaa9c2745 (diff)
net: Remove iocb argument from sendmsg and recvmsg
After TIPC doesn't depend on iocb argument in its internal implementations of sendmsg() and recvmsg() hooks defined in proto structure, no any user is using iocb argument in them at all now. Then we can drop the redundant iocb argument completely from kinds of implementations of both sendmsg() and recvmsg() in the entire networking stack. Cc: Christoph Hellwig <hch@lst.de> Suggested-by: Al Viro <viro@ZenIV.linux.org.uk> Signed-off-by: Ying Xue <ying.xue@windriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp')
-rw-r--r--net/sctp/socket.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index aafe94bf292e..f1a65398f311 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -1586,8 +1586,7 @@ static int sctp_error(struct sock *sk, int flags, int err)
1586 1586
1587static int sctp_msghdr_parse(const struct msghdr *, sctp_cmsgs_t *); 1587static int sctp_msghdr_parse(const struct msghdr *, sctp_cmsgs_t *);
1588 1588
1589static int sctp_sendmsg(struct kiocb *iocb, struct sock *sk, 1589static int sctp_sendmsg(struct sock *sk, struct msghdr *msg, size_t msg_len)
1590 struct msghdr *msg, size_t msg_len)
1591{ 1590{
1592 struct net *net = sock_net(sk); 1591 struct net *net = sock_net(sk);
1593 struct sctp_sock *sp; 1592 struct sctp_sock *sp;
@@ -2066,9 +2065,8 @@ static int sctp_skb_pull(struct sk_buff *skb, int len)
2066 * flags - flags sent or received with the user message, see Section 2065 * flags - flags sent or received with the user message, see Section
2067 * 5 for complete description of the flags. 2066 * 5 for complete description of the flags.
2068 */ 2067 */
2069static int sctp_recvmsg(struct kiocb *iocb, struct sock *sk, 2068static int sctp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,
2070 struct msghdr *msg, size_t len, int noblock, 2069 int noblock, int flags, int *addr_len)
2071 int flags, int *addr_len)
2072{ 2070{
2073 struct sctp_ulpevent *event = NULL; 2071 struct sctp_ulpevent *event = NULL;
2074 struct sctp_sock *sp = sctp_sk(sk); 2072 struct sctp_sock *sp = sctp_sk(sk);