From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Howells <dhowells@redhat.com>, Jens Axboe <axboe@kernel.dk>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Pavel Begunkov <asml.silence@gmail.com>
Subject: linux-next: build failure after merge of the keys tree
Date: Mon, 2 Mar 2020 11:37:37 +1100 [thread overview]
Message-ID: <20200302113737.7c3fdee0@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1877 bytes --]
Hi all,
After merging the keys tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:
fs/io_uring.c: In function 'io_splice_punt':
fs/io_uring.c:2473:6: error: too few arguments to function 'get_pipe_info'
2473 | if (get_pipe_info(file))
| ^~~~~~~~~~~~~
In file included from include/linux/splice.h:12,
from include/linux/skbuff.h:36,
from include/linux/if_ether.h:19,
from include/uapi/linux/ethtool.h:19,
from include/linux/ethtool.h:18,
from include/linux/netdevice.h:37,
from include/net/sock.h:46,
from fs/io_uring.c:64:
include/linux/pipe_fs_i.h:267:25: note: declared here
267 | struct pipe_inode_info *get_pipe_info(struct file *file, bool for_splice);
| ^~~~~~~~~~~~~
Caused by commit
549d46d3827d ("pipe: Add general notification queue support")
interacting with commit
52b31bc9aabc ("io_uring: add splice(2) support")
from the block tree.
I have added the following merge fix patch.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 2 Mar 2020 11:27:27 +1100
Subject: [PATCH] io_uring: fix up for get_pipe_info() API change
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 fb8fe0bd5e18..8cdd3870cd4e 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -2470,7 +2470,7 @@ static int io_splice_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
static bool io_splice_punt(struct file *file)
{
- if (get_pipe_info(file))
+ if (get_pipe_info(file, true))
return false;
if (!io_file_supports_async(file))
return true;
--
2.25.0
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2020-03-02 0:37 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-02 0:37 Stephen Rothwell [this message]
2020-03-02 15:23 ` linux-next: build failure after merge of the keys tree Pavel Begunkov
2020-05-04 3:25 ` Stephen Rothwell
2020-05-04 3:29 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2020-12-11 4:50 Stephen Rothwell
2020-05-18 4:57 Stephen Rothwell
2020-05-14 4:30 Stephen Rothwell
2020-05-14 4:46 ` Jason A. Donenfeld
2020-05-14 12:11 ` David Howells
2020-05-14 12:34 ` Masahiro Yamada
2020-05-14 23:25 ` Jason A. Donenfeld
2020-02-09 23:05 Stephen Rothwell
2020-02-09 23:07 ` Stephen Rothwell
2020-02-11 23:23 ` Stephen Rothwell
2020-01-16 1:36 Stephen Rothwell
2019-08-29 5:31 Stephen Rothwell
2019-09-02 6:19 ` Stephen Rothwell
2019-09-02 16:01 ` David Howells
2019-09-02 23:07 ` Stephen Rothwell
2019-09-02 23:21 ` Stephen Rothwell
2019-09-02 23:53 ` David Howells
2019-09-03 0:29 ` Stephen Rothwell
2019-09-02 23:20 ` David Howells
2019-09-02 23:39 ` Stephen Rothwell
2019-09-02 23:51 ` David Howells
2019-08-16 5:04 Stephen Rothwell
2017-11-13 2:08 Stephen Rothwell
2017-11-13 11:21 ` David Howells
2017-04-04 3:39 Stephen Rothwell
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=20200302113737.7c3fdee0@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=asml.silence@gmail.com \
--cc=axboe@kernel.dk \
--cc=dhowells@redhat.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).