diff mbox

crypto: Fix aead_{sendmsg,recvmsg}() signatures.

Message ID 20150417.151953.196971237843380420.davem@davemloft.net (mailing list archive)
State Not Applicable
Delegated to: Herbert Xu
Headers show

Commit Message

David Miller April 17, 2015, 7:19 p.m. UTC 
The kiocb argument is no longer present.

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

--
To unsubscribe from this list: send the line "unsubscribe linux-crypto" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Herbert Xu April 18, 2015, 1:33 a.m. UTC | #1 
On Fri, Apr 17, 2015 at 03:19:53PM -0400, David Miller wrote:
> 
> The kiocb argument is no longer present.
> 
> Signed-off-by: David S. Miller <davem@davemloft.net>

I think Linus has already fixed this with

commit eccd02f32a2c25139da2d5e72ebab1fee7b5baab
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Wed Apr 15 14:09:46 2015 -0700

    crypto: fix mis-merge with the networking merge

Thanks,
David Miller April 18, 2015, 3:45 a.m. UTC | #2 
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Sat, 18 Apr 2015 09:33:17 +0800

> On Fri, Apr 17, 2015 at 03:19:53PM -0400, David Miller wrote:
>> 
>> The kiocb argument is no longer present.
>> 
>> Signed-off-by: David S. Miller <davem@davemloft.net>
> 
> I think Linus has already fixed this with
> 
> commit eccd02f32a2c25139da2d5e72ebab1fee7b5baab
> Author: Linus Torvalds <torvalds@linux-foundation.org>
> Date:   Wed Apr 15 14:09:46 2015 -0700
> 
>     crypto: fix mis-merge with the networking merge

Awesome, thanks Herbert.
--
To unsubscribe from this list: send the line "unsubscribe linux-crypto" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/crypto/algif_aead.c b/crypto/algif_aead.c
index 527d27b..95ad689 100644
--- a/crypto/algif_aead.c
+++ b/crypto/algif_aead.c
@@ -163,8 +163,7 @@  static void aead_data_wakeup(struct sock *sk)
 	rcu_read_unlock();
 }
 
-static int aead_sendmsg(struct kiocb *unused, struct socket *sock,
-			struct msghdr *msg, size_t size)
+static int aead_sendmsg(struct socket *sock, struct msghdr *msg, size_t size)
 {
 	struct sock *sk = sock->sk;
 	struct alg_sock *ask = alg_sk(sk);
@@ -348,8 +347,8 @@  unlock:
 	return err ?: size;
 }
 
-static int aead_recvmsg(struct kiocb *unused, struct socket *sock,
-			struct msghdr *msg, size_t ignored, int flags)
+static int aead_recvmsg(struct socket *sock, struct msghdr *msg,
+			size_t ignored, int flags)
 {
 	struct sock *sk = sock->sk;
 	struct alg_sock *ask = alg_sk(sk);