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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20150324134508.77b039a9@canb.auug.org.au>
Date:	Tue, 24 Mar 2015 13:45:08 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	David Miller <davem@...emloft.net>, <netdev@...r.kernel.org>,
	Al Viro <viro@...IV.linux.org.uk>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Christoph Hellwig <hch@....de>,
	Tadeusz Struk <tadeusz.struk@...el.com>
Subject: linux-next: build failure after merge of the net-next tree

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@...b.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@...b.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@...b.auug.org.au

Content of type "application/pgp-signature" skipped