aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/ping.c
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/ipv4/ping.c
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/ipv4/ping.c')
-rw-r--r--net/ipv4/ping.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
index e9f66e1cda50..3648e7f32f3d 100644
--- a/net/ipv4/ping.c
+++ b/net/ipv4/ping.c
@@ -684,8 +684,7 @@ int ping_common_sendmsg(int family, struct msghdr *msg, size_t len,
684} 684}
685EXPORT_SYMBOL_GPL(ping_common_sendmsg); 685EXPORT_SYMBOL_GPL(ping_common_sendmsg);
686 686
687static int ping_v4_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, 687static int ping_v4_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
688 size_t len)
689{ 688{
690 struct net *net = sock_net(sk); 689 struct net *net = sock_net(sk);
691 struct flowi4 fl4; 690 struct flowi4 fl4;
@@ -841,8 +840,8 @@ do_confirm:
841 goto out; 840 goto out;
842} 841}
843 842
844int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, 843int ping_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int noblock,
845 size_t len, int noblock, int flags, int *addr_len) 844 int flags, int *addr_len)
846{ 845{
847 struct inet_sock *isk = inet_sk(sk); 846 struct inet_sock *isk = inet_sk(sk);
848 int family = sk->sk_family; 847 int family = sk->sk_family;