From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Benjamin LaHaise <bcrl@kvack.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Dave Kleikamp <dave.kleikamp@oracle.com>
Subject: linux-next: build failure after merge of the aio tree
Date: Wed, 21 Aug 2013 17:45:22 +1000 [thread overview]
Message-ID: <20130821174522.3af60c89647476d2aab5f47c@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2157 bytes --]
Hi Benjamin,
After merging the aio tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
fs/aio.c: In function 'aio_kernel_init_rw':
fs/aio.c:1359:6: error: 'struct kiocb' has no member named 'ki_left'
iocb->ki_left = nr;
^
fs/aio.c: In function 'aio_kernel_submit':
fs/aio.c:1394:6: error: 'struct kiocb' has no member named 'ki_opcode'
iocb->ki_opcode = op;
^
fs/aio.c:1395:6: error: 'struct kiocb' has no member named 'ki_buf'
iocb->ki_buf = (char __user *)(unsigned long)ptr;
^
fs/aio.c:1398:2: error: too few arguments to function 'aio_run_iocb'
ret = aio_run_iocb(iocb, 0);
^
fs/aio.c:1217:16: note: declared here
static ssize_t aio_run_iocb(struct kiocb *req, unsigned opcode,
^
Caused by commit af9fa2024c38 ("aio: add aio_kernel_() interface") from
the aio-direct tree interacting with commit 8bc92afcf7f5 ("aio: Kill
unneeded kiocb members") from the aio tree.
I applied the following merge fix patch (and I can carry it as necessary
- thanks, Dave, for the hint patches):
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 21 Aug 2013 17:42:14 +1000
Subject: [PATCH] aio: semantic fixup
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
fs/aio.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/fs/aio.c b/fs/aio.c
index 39fb7b0..59b46cd 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -1356,7 +1356,6 @@ void aio_kernel_init_rw(struct kiocb *iocb, struct file *filp,
size_t nr, loff_t off)
{
iocb->ki_filp = filp;
- iocb->ki_left = nr;
iocb->ki_nbytes = nr;
iocb->ki_pos = off;
iocb->ki_ctx = (void *)-1;
@@ -1391,11 +1390,7 @@ int aio_kernel_submit(struct kiocb *iocb, unsigned short op, void *ptr)
BUG_ON(!iocb->ki_obj.complete);
BUG_ON(!iocb->ki_filp);
- iocb->ki_opcode = op;
- iocb->ki_buf = (char __user *)(unsigned long)ptr;
- iocb->ki_iter = ptr;
-
- ret = aio_run_iocb(iocb, 0);
+ ret = aio_run_iocb(iocb, op, ptr, 0);
if (ret)
aio_kernel_free(iocb);
--
1.8.4.rc3
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2013-08-21 7:45 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-21 7:45 Stephen Rothwell [this message]
2013-08-21 15:52 ` linux-next: build failure after merge of the aio tree Dave Kleikamp
2013-08-21 23:53 ` Stephen Rothwell
2013-08-30 7:55 Stephen Rothwell
2013-08-30 14:26 ` Benjamin LaHaise
2013-08-30 17:38 ` Linus Torvalds
2013-08-30 17:42 ` Benjamin LaHaise
2016-01-12 5:40 Stephen Rothwell
2016-01-12 16:38 ` Benjamin LaHaise
2016-01-27 2:40 ` Stephen Rothwell
2016-01-29 11:30 ` Russell King - ARM Linux
2016-01-29 12:03 ` Geert Uytterhoeven
2016-02-04 2:19 ` Stephen Rothwell
2016-02-04 13:41 ` Benjamin LaHaise
2016-02-04 13:50 ` Russell King - ARM Linux
2016-02-04 14:08 ` Benjamin LaHaise
2016-02-04 14:12 ` Russell King - ARM Linux
2016-02-04 14:32 ` Benjamin LaHaise
2016-02-04 14:39 ` Russell King - ARM Linux
2016-02-04 16:01 ` Benjamin LaHaise
2016-02-04 16:17 ` Russell King - ARM Linux
2016-02-04 16:27 ` Benjamin LaHaise
2016-02-04 16:47 ` Benjamin LaHaise
2016-02-04 18:48 ` Benjamin LaHaise
2016-01-15 2:24 ` Stephen Rothwell
2016-01-15 7:39 ` Christoph Hellwig
2016-01-15 9:23 ` Stephen Rothwell
2016-01-15 9:25 ` Christoph Hellwig
2016-01-15 15:18 ` Benjamin LaHaise
2016-01-15 22:55 ` Stephen Rothwell
2016-03-14 4:49 ` Stephen Rothwell
2016-03-14 17:08 ` Benjamin LaHaise
2016-03-14 20:41 ` Stephen Rothwell
2016-03-15 6:46 Stephen Rothwell
2016-03-15 14:38 ` Andy Shevchenko
2016-03-15 16:42 ` Arnd Bergmann
2016-03-15 16:19 ` Sudip Mukherjee
2016-03-15 16:22 ` Benjamin LaHaise
2016-03-15 22:02 ` Arnd Bergmann
2016-03-16 11:12 ` Andy Shevchenko
2016-03-16 13:59 ` Arnd Bergmann
2016-03-16 14:07 ` Benjamin LaHaise
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130821174522.3af60c89647476d2aab5f47c@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=bcrl@kvack.org \
--cc=dave.kleikamp@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).