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>

1 files changed, 9 insertions, 12 deletions

diff --git a/net/ieee802154/socket.c b/net/ieee802154/socket.c
index 2878d8ca6d3b..b60c65f70346 100644
--- a/net/ieee802154/socket.c
+++ b/net/ieee802154/socket.c
@@ -98,12 +98,12 @@ static int ieee802154_sock_release(struct socket *sock)
         return 0;
 }
 
-static int ieee802154_sock_sendmsg(struct kiocb *iocb, struct socket *sock,
-                                   struct msghdr *msg, size_t len)
+static int ieee802154_sock_sendmsg(struct socket *sock, struct msghdr *msg,
+                                   size_t len)
 {
         struct sock *sk = sock->sk;
 
-        return sk->sk_prot->sendmsg(iocb, sk, msg, len);
+        return sk->sk_prot->sendmsg(sk, msg, len);
 }
 
 static int ieee802154_sock_bind(struct socket *sock, struct sockaddr *uaddr,
@@ -255,8 +255,7 @@ static int raw_disconnect(struct sock *sk, int flags)
         return 0;
 }
 
-static int raw_sendmsg(struct kiocb *iocb, struct sock *sk,
-                       struct msghdr *msg, size_t size)
+static int raw_sendmsg(struct sock *sk, struct msghdr *msg, size_t size)
 {
         struct net_device *dev;
         unsigned int mtu;
@@ -327,8 +326,8 @@ out:
         return err;
 }
 
-static int raw_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
-                       size_t len, int noblock, int flags, int *addr_len)
+static int raw_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,
+                       int noblock, int flags, int *addr_len)
 {
         size_t copied = 0;
         int err = -EOPNOTSUPP;
@@ -615,8 +614,7 @@ static int dgram_disconnect(struct sock *sk, int flags)
         return 0;
 }
 
-static int dgram_sendmsg(struct kiocb *iocb, struct sock *sk,
-                         struct msghdr *msg, size_t size)
+static int dgram_sendmsg(struct sock *sk, struct msghdr *msg, size_t size)
 {
         struct net_device *dev;
         unsigned int mtu;
@@ -715,9 +713,8 @@ out:
         return err;
 }
 
-static int dgram_recvmsg(struct kiocb *iocb, struct sock *sk,
-                         struct msghdr *msg, size_t len, int noblock,
-                         int flags, int *addr_len)
+static int dgram_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,
+                         int noblock, int flags, int *addr_len)
 {
         size_t copied = 0;
         int err = -EOPNOTSUPP;