Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b4844353 authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarDavid S. Miller <davem@davemloft.net>
parents 6556c385 1b784140

crypto/algif_hash.c

+4 −4
Original line number Diff line number Diff line
@@ -34,8 +34,8 @@ struct hash_ctx { 
	struct ahash_request req;

};



static int hash_sendmsg(struct kiocb *unused, struct socket *sock,

			struct msghdr *msg, size_t ignored)

static int hash_sendmsg(struct socket *sock, struct msghdr *msg,

			size_t ignored)

{

	int limit = ALG_MAX_PAGES * PAGE_SIZE;

	struct sock *sk = sock->sk;
@@ -139,8 +139,8 @@ static ssize_t hash_sendpage(struct socket *sock, struct page *page, 
	return err ?: size;

}



static int hash_recvmsg(struct kiocb *unused, struct socket *sock,

			struct msghdr *msg, size_t len, int flags)

static int hash_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,

			int flags)

{

	struct sock *sk = sock->sk;

	struct alg_sock *ask = alg_sk(sk);

crypto/algif_rng.c

+2 −2
Original line number Diff line number Diff line
@@ -55,8 +55,8 @@ struct rng_ctx { 
	struct crypto_rng *drng;

};



static int rng_recvmsg(struct kiocb *unused, struct socket *sock,

		       struct msghdr *msg, size_t len, int flags)

static int rng_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,

		       int flags)

{

	struct sock *sk = sock->sk;

	struct alg_sock *ask = alg_sk(sk);

crypto/algif_skcipher.c

+4 −4
Original line number Diff line number Diff line
@@ -239,8 +239,8 @@ static void skcipher_data_wakeup(struct sock *sk) 
	rcu_read_unlock();

}



static int skcipher_sendmsg(struct kiocb *unused, struct socket *sock,

			    struct msghdr *msg, size_t size)

static int skcipher_sendmsg(struct socket *sock, struct msghdr *msg,

			    size_t size)

{

	struct sock *sk = sock->sk;

	struct alg_sock *ask = alg_sk(sk);
@@ -424,8 +424,8 @@ static ssize_t skcipher_sendpage(struct socket *sock, struct page *page, 
	return err ?: size;

}



static int skcipher_recvmsg(struct kiocb *unused, struct socket *sock,

			    struct msghdr *msg, size_t ignored, int flags)

static int skcipher_recvmsg(struct socket *sock, struct msghdr *msg,

			    size_t ignored, int flags)

{

	struct sock *sk = sock->sk;

	struct alg_sock *ask = alg_sk(sk);

drivers/isdn/mISDN/socket.c

+3 −4
Original line number Diff line number Diff line
@@ -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;

drivers/net/macvtap.c

+4 −5
Original line number Diff line number Diff line
@@ -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;