Merge branch 'sendmsg_recvmsg_iocb_removal'

Ying Xue says:

====================
net: Remove iocb argument from sendmsg and recvmsg

Currently there is only one user - TIPC whose sendmsg() instances
using iocb argument. Meanwhile, there is no user using iocb argument
in its recvmsg() instance. Therefore, if we eliminate the werid usage
of iobc argument from TIPC, the iocb argument can be removed from
all sendmsg() and recvmsg() instances of the whole networking stack.

Reference:
https://patchwork.ozlabs.org/patch/433960/

Changes:

v2:
 * Fix compile errors of DCCP module pointed by David
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

5 files changed, 16 insertions, 20 deletions

diff --git a/drivers/isdn/mISDN/socket.c b/drivers/isdn/mISDN/socket.c
index 84b35925ee4d..8dc7290089bb 100644
--- a/drivers/isdn/mISDN/socket.c
+++ b/drivers/isdn/mISDN/socket.c
@@ -112,8 +112,8 @@ mISDN_sock_cmsg(struct sock *sk, struct msghdr *msg, struct sk_buff *skb)
 }
 
 static int
-mISDN_sock_recvmsg(struct kiocb *iocb, struct socket *sock,
-                   struct msghdr *msg, size_t len, int flags)
+mISDN_sock_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,
+                   int flags)
 {
         struct sk_buff          *skb;
         struct sock             *sk = sock->sk;
@@ -173,8 +173,7 @@ mISDN_sock_recvmsg(struct kiocb *iocb, struct socket *sock,
 }
 
 static int
-mISDN_sock_sendmsg(struct kiocb *iocb, struct socket *sock,
-                   struct msghdr *msg, size_t len)
+mISDN_sock_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)
 {
         struct sock             *sk = sock->sk;
         struct sk_buff          *skb;
diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
index e40fdfccc9c1..1e51c6bf3ae1 100644
--- a/drivers/net/macvtap.c
+++ b/drivers/net/macvtap.c
@@ -1127,16 +1127,15 @@ static const struct file_operations macvtap_fops = {
 #endif
 };
 
-static int macvtap_sendmsg(struct kiocb *iocb, struct socket *sock,
-                           struct msghdr *m, size_t total_len)
+static int macvtap_sendmsg(struct socket *sock, struct msghdr *m,
+                           size_t total_len)
 {
         struct macvtap_queue *q = container_of(sock, struct macvtap_queue, sock);
         return macvtap_get_user(q, m, &m->msg_iter, m->msg_flags & MSG_DONTWAIT);
 }
 
-static int macvtap_recvmsg(struct kiocb *iocb, struct socket *sock,
-                           struct msghdr *m, size_t total_len,
-                           int flags)
+static int macvtap_recvmsg(struct socket *sock, struct msghdr *m,
+                           size_t total_len, int flags)
 {
         struct macvtap_queue *q = container_of(sock, struct macvtap_queue, sock);
         int ret;
diff --git a/drivers/net/ppp/pppoe.c b/drivers/net/ppp/pppoe.c
index 9c97e9bcf5f5..ff059e1d8ac6 100644
--- a/drivers/net/ppp/pppoe.c
+++ b/drivers/net/ppp/pppoe.c
@@ -835,8 +835,8 @@ static int pppoe_ioctl(struct socket *sock, unsigned int cmd,
         return err;
 }
 
-static int pppoe_sendmsg(struct kiocb *iocb, struct socket *sock,
-                  struct msghdr *m, size_t total_len)
+static int pppoe_sendmsg(struct socket *sock, struct msghdr *m,
+                         size_t total_len)
 {
         struct sk_buff *skb;
         struct sock *sk = sock->sk;
@@ -977,8 +977,8 @@ static const struct ppp_channel_ops pppoe_chan_ops = {
         .start_xmit = pppoe_xmit,
 };
 
-static int pppoe_recvmsg(struct kiocb *iocb, struct socket *sock,
-                  struct msghdr *m, size_t total_len, int flags)
+static int pppoe_recvmsg(struct socket *sock, struct msghdr *m,
+                         size_t total_len, int flags)
 {
         struct sock *sk = sock->sk;
         struct sk_buff *skb;
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 857dca47bf80..b96b94cee760 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -1448,8 +1448,7 @@ static void tun_sock_write_space(struct sock *sk)
         kill_fasync(&tfile->fasync, SIGIO, POLL_OUT);
 }
 
-static int tun_sendmsg(struct kiocb *iocb, struct socket *sock,
-                       struct msghdr *m, size_t total_len)
+static int tun_sendmsg(struct socket *sock, struct msghdr *m, size_t total_len)
 {
         int ret;
         struct tun_file *tfile = container_of(sock, struct tun_file, socket);
@@ -1464,8 +1463,7 @@ static int tun_sendmsg(struct kiocb *iocb, struct socket *sock,
         return ret;
 }
 
-static int tun_recvmsg(struct kiocb *iocb, struct socket *sock,
-                       struct msghdr *m, size_t total_len,
+static int tun_recvmsg(struct socket *sock, struct msghdr *m, size_t total_len,
                        int flags)
 {
         struct tun_file *tfile = container_of(sock, struct tun_file, socket);
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
index afa06d28725d..633012cc9a57 100644
--- a/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
@@ -390,7 +390,7 @@ static void handle_tx(struct vhost_net *net)
                         ubufs = NULL;
                 }
                 /* TODO: Check specific error and bomb out unless ENOBUFS? */
-                err = sock->ops->sendmsg(NULL, sock, &msg, len);
+                err = sock->ops->sendmsg(sock, &msg, len);
                 if (unlikely(err < 0)) {
                         if (zcopy_used) {
                                 vhost_net_ubuf_put(ubufs);
@@ -566,7 +566,7 @@ static void handle_rx(struct vhost_net *net)
                 /* On overrun, truncate and discard */
                 if (unlikely(headcount > UIO_MAXIOV)) {
                         iov_iter_init(&msg.msg_iter, READ, vq->iov, 1, 1);
-                        err = sock->ops->recvmsg(NULL, sock, &msg,
+                        err = sock->ops->recvmsg(sock, &msg,
                                                  1, MSG_DONTWAIT | MSG_TRUNC);
                         pr_debug("Discarded rx packet: len %zd\n", sock_len);
                         continue;
@@ -597,7 +597,7 @@ static void handle_rx(struct vhost_net *net)
                          */
                         iov_iter_advance(&fixup, sizeof(hdr));
                 }
-                err = sock->ops->recvmsg(NULL, sock, &msg,
+                err = sock->ops->recvmsg(sock, &msg,
                                          sock_len, MSG_DONTWAIT | MSG_TRUNC);
                 /* Userspace might have consumed the packet meanwhile:
                  * it's not supposed to do this usually, but might be hard