aboutsummaryrefslogtreecommitdiffstats
path: root/crypto
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 /crypto
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 'crypto')
-rw-r--r--crypto/algif_hash.c8
-rw-r--r--crypto/algif_rng.c4
-rw-r--r--crypto/algif_skcipher.c8
3 files changed, 10 insertions, 10 deletions
diff --git a/crypto/algif_hash.c b/crypto/algif_hash.c
index 01da360bdb55..0a465e0f3012 100644
--- a/crypto/algif_hash.c
+++ b/crypto/algif_hash.c
@@ -34,8 +34,8 @@ struct hash_ctx {
34 struct ahash_request req; 34 struct ahash_request req;
35}; 35};
36 36
37static int hash_sendmsg(struct kiocb *unused, struct socket *sock, 37static int hash_sendmsg(struct socket *sock, struct msghdr *msg,
38 struct msghdr *msg, size_t ignored) 38 size_t ignored)
39{ 39{
40 int limit = ALG_MAX_PAGES * PAGE_SIZE; 40 int limit = ALG_MAX_PAGES * PAGE_SIZE;
41 struct sock *sk = sock->sk; 41 struct sock *sk = sock->sk;
@@ -139,8 +139,8 @@ unlock:
139 return err ?: size; 139 return err ?: size;
140} 140}
141 141
142static int hash_recvmsg(struct kiocb *unused, struct socket *sock, 142static int hash_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,
143 struct msghdr *msg, size_t len, int flags) 143 int flags)
144{ 144{
145 struct sock *sk = sock->sk; 145 struct sock *sk = sock->sk;
146 struct alg_sock *ask = alg_sk(sk); 146 struct alg_sock *ask = alg_sk(sk);
diff --git a/crypto/algif_rng.c b/crypto/algif_rng.c
index 67f612cfed97..3acba0a7cd55 100644
--- a/crypto/algif_rng.c
+++ b/crypto/algif_rng.c
@@ -55,8 +55,8 @@ struct rng_ctx {
55 struct crypto_rng *drng; 55 struct crypto_rng *drng;
56}; 56};
57 57
58static int rng_recvmsg(struct kiocb *unused, struct socket *sock, 58static int rng_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,
59 struct msghdr *msg, size_t len, int flags) 59 int flags)
60{ 60{
61 struct sock *sk = sock->sk; 61 struct sock *sk = sock->sk;
62 struct alg_sock *ask = alg_sk(sk); 62 struct alg_sock *ask = alg_sk(sk);
diff --git a/crypto/algif_skcipher.c b/crypto/algif_skcipher.c
index 0c8a1e5ccadf..b9743dc35801 100644
--- a/crypto/algif_skcipher.c
+++ b/crypto/algif_skcipher.c
@@ -239,8 +239,8 @@ static void skcipher_data_wakeup(struct sock *sk)
239 rcu_read_unlock(); 239 rcu_read_unlock();
240} 240}
241 241
242static int skcipher_sendmsg(struct kiocb *unused, struct socket *sock, 242static int skcipher_sendmsg(struct socket *sock, struct msghdr *msg,
243 struct msghdr *msg, size_t size) 243 size_t size)
244{ 244{
245 struct sock *sk = sock->sk; 245 struct sock *sk = sock->sk;
246 struct alg_sock *ask = alg_sk(sk); 246 struct alg_sock *ask = alg_sk(sk);
@@ -424,8 +424,8 @@ unlock:
424 return err ?: size; 424 return err ?: size;
425} 425}
426 426
427static int skcipher_recvmsg(struct kiocb *unused, struct socket *sock, 427static int skcipher_recvmsg(struct socket *sock, struct msghdr *msg,
428 struct msghdr *msg, size_t ignored, int flags) 428 size_t ignored, int flags)
429{ 429{
430 struct sock *sk = sock->sk; 430 struct sock *sk = sock->sk;
431 struct alg_sock *ask = alg_sk(sk); 431 struct alg_sock *ask = alg_sk(sk);