diff options
author | Ying Xue <ying.xue@windriver.com> | 2015-03-02 02:37:48 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-03-02 13:06:31 -0500 |
commit | 1b784140474e4fc94281a49e96c67d29df0efbde (patch) | |
tree | 569e9813ae7ab79616849b117c6b50b3d6e4dabb /net/ipv4/udp.c | |
parent | 39a0295f901423e260a034ac7c3211ecaa9c2745 (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/ipv4/udp.c')
-rw-r--r-- | net/ipv4/udp.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 0224f930c613..f27556e2158b 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c | |||
@@ -873,8 +873,7 @@ out: | |||
873 | } | 873 | } |
874 | EXPORT_SYMBOL(udp_push_pending_frames); | 874 | EXPORT_SYMBOL(udp_push_pending_frames); |
875 | 875 | ||
876 | int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, | 876 | int udp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) |
877 | size_t len) | ||
878 | { | 877 | { |
879 | struct inet_sock *inet = inet_sk(sk); | 878 | struct inet_sock *inet = inet_sk(sk); |
880 | struct udp_sock *up = udp_sk(sk); | 879 | struct udp_sock *up = udp_sk(sk); |
@@ -1136,7 +1135,7 @@ int udp_sendpage(struct sock *sk, struct page *page, int offset, | |||
1136 | * sendpage interface can't pass. | 1135 | * sendpage interface can't pass. |
1137 | * This will succeed only when the socket is connected. | 1136 | * This will succeed only when the socket is connected. |
1138 | */ | 1137 | */ |
1139 | ret = udp_sendmsg(NULL, sk, &msg, 0); | 1138 | ret = udp_sendmsg(sk, &msg, 0); |
1140 | if (ret < 0) | 1139 | if (ret < 0) |
1141 | return ret; | 1140 | return ret; |
1142 | } | 1141 | } |
@@ -1254,8 +1253,8 @@ EXPORT_SYMBOL(udp_ioctl); | |||
1254 | * return it, otherwise we block. | 1253 | * return it, otherwise we block. |
1255 | */ | 1254 | */ |
1256 | 1255 | ||
1257 | int udp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, | 1256 | int udp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int noblock, |
1258 | size_t len, int noblock, int flags, int *addr_len) | 1257 | int flags, int *addr_len) |
1259 | { | 1258 | { |
1260 | struct inet_sock *inet = inet_sk(sk); | 1259 | struct inet_sock *inet = inet_sk(sk); |
1261 | DECLARE_SOCKADDR(struct sockaddr_in *, sin, msg->msg_name); | 1260 | DECLARE_SOCKADDR(struct sockaddr_in *, sin, msg->msg_name); |