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

Stephen Rothwell
2020-09-23T04:34:27Z

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

Hi all,

After merging the block tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

fs/io_uring.c: In function 'io_resubmit_prep':
fs/io_uring.c:2357:10: error: 'struct io_kiocb' has no member named 'io'
2357 | if (!req->io) {
| ^~

Caused by commit

8f3d749685e4 ("io_uring: don't re-setup vecs/iter in io_resumit_prep() is already there")

from Linus' tree interacting with commit

76c917267129 ("io_uring: get rid of req->io/io_async_ctx union")

from the block tree.

I added the following merge resolution:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 23 Sep 2020 14:30:01 +1000
Subject: [PATCH] fix up for "io_uring: get rid of req->io/io_async_ctx union"

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

diff --git a/fs/io_uring.c b/fs/io_uring.c
index 5aefea5bb383..0a72f4eed845 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -2354,7 +2354,7 @@ static bool io_resubmit_prep(struct io_kiocb *req, int error)
goto end_req;
}

- if (!req->io) {
+ if (!req->async_data) {
ret = io_import_iovec(rw, req, &iovec, &iter, false);
if (ret < 0)
goto end_req;
--
2.28.0

--
Cheers,
Stephen Rothwell

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