Subject: Re: linux-next: build failure after merge of the keys tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 4 May 2020 13:25:29 +1000

Hi all,

On Mon, 2 Mar 2020 11:37:37 +1100 Stephen Rothwell <[email-masked]> wrote:
>
> 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 <[email-masked]>
> 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 <[email-masked]>
> ---
>  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;

Due to further changes in Linus' tree over the weekend, this fixup is
not linger needed.

-- 
Cheers,
Stephen Rothwell