Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Mon, 4 May 2020 13:25:29 +1000
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: Re: linux-next: build failure after merge of the keys tree
Message-ID: <20200504132529.44037944@canb.auug.org.au>
In-Reply-To: <20200302113737.7c3fdee0@canb.auug.org.au>
References: <20200302113737.7c3fdee0@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/VW.234rJBC/4GE2/O1e+N98";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

--Sig_/VW.234rJBC/4GE2/O1e+N98
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Mon, 2 Mar 2020 11:37:37 +1100 Stephen Rothwell <sfr@canb.auug.org.au> w=
rote:
>
> After merging the keys tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>=20
> 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);
>       |                         ^~~~~~~~~~~~~
>=20
> Caused by commit
>=20
>   549d46d3827d ("pipe: Add general notification queue support")
>=20
> interacting with commit
>=20
>   52b31bc9aabc ("io_uring: add splice(2) support")
>=20
> from the block tree.
>=20
> I have added the following merge fix patch.
>=20
> 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
>=20
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  fs/io_uring.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>=20
> 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, con=
st struct io_uring_sqe *sqe)
> =20
>  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.

--=20
Cheers,
Stephen Rothwell

--Sig_/VW.234rJBC/4GE2/O1e+N98
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl6viykACgkQAVBC80lX
0Gz3cQf8DUU/HSj0wI2d8OdR3r1cWkdPrY7dEQw+CXwktgQOEcNQ08N/lUQ7vj0c
VoeiCsJjfnbPFbvaVUDxOs0okqndNq6yN4QVXB0i6SwytaiTLWqd8rsJbNyfKl3i
mLMMGL94xVLciVbytR5gu0ckq3gr3RgbCvdz9NUYQEd7ErLUjNRBs0UC0kGWcP7+
I51AvYDqliGqPDVRGHhktid8zAdoUWo5ofMZ3LPz0pO0sj2ZHv+DT091pduwBr9y
sXxJFoAnXJlRhyTxtuIpq6BAnyBCQN9pi7pfloRPwoIqKL02SaA0Od2QJZtOyQ3a
qaskGLHuc7J/EyLT4ZW0aCOG9BgWRA==
=qvZ5
-----END PGP SIGNATURE-----

--Sig_/VW.234rJBC/4GE2/O1e+N98--