linux-next: build failure after merge of the net-next tree

Stephen Rothwell
2015-03-24T02:45:20Z

[-- Attachment #1: Type: text/plain, Size: 1495 bytes --]

Hi all,

After merging the net-next tree, today's linux-next build (x86_64
allmodconfig) failed like this:

crypto/algif_skcipher.c: In function 'skcipher_async_cb':
crypto/algif_skcipher.c:109:2: error: implicit declaration of function 'aio_complete' [-Werror=implicit-function-declaration]
aio_complete(iocb, err, err);
^

Caused by commit a596999b7ddf ("crypto: algif - change algif_skcipher
to be asynchronous") interacting with commit 04b2fa9f8f36 ("fs: split
generic and aio kiocb") from the vfs tree.

I applied the following merge fix patch (which gets it building, but I
am not sure if more is needed).

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 24 Mar 2015 13:40:45 +1100
Subject: [PATCH] crypto: algif - cope with aio_complete() going away

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
crypto/algif_skcipher.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/algif_skcipher.c b/crypto/algif_skcipher.c
index 8276f21ea7be..506eb5f62b03 100644
--- a/crypto/algif_skcipher.c
+++ b/crypto/algif_skcipher.c
@@ -106,7 +106,7 @@ static void skcipher_async_cb(struct crypto_async_request *req, int err)
atomic_dec(&ctx->inflight);
skcipher_free_async_sgls(sreq);
kfree(req);
- aio_complete(iocb, err, err);
+ iocb->ki_complete(iocb, err, err);
}

static inline int skcipher_sndbuf(struct sock *sk)
--
2.1.4

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]