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, 7 Dec 2020 14:09:51 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>,
        Daniel Borkmann <daniel@iogearbox.net>,
        Alexei Starovoitov <ast@kernel.org>,
        Networking <netdev@vger.kernel.org>
Cc:     David Miller <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>,
        Florent Revest <revest@chromium.org>,
        Florent Revest <revest@google.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: build failure after merge of the block tree
Message-ID: <20201207140951.4c04f26f@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/5kRkZNS/rNEXgq/a/ECeDM6";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/5kRkZNS/rNEXgq/a/ECeDM6
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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_shutdown':
fs/io_uring.c:3782:9: error: too many arguments to function 'sock_from_file'
 3782 |  sock =3D sock_from_file(req->file, &ret);
      |         ^~~~~~~~~~~~~~
In file included from fs/io_uring.c:63:
include/linux/net.h:243:16: note: declared here
  243 | struct socket *sock_from_file(struct file *file);
      |                ^~~~~~~~~~~~~~

Caused by commit

  36f4fa6886a8 ("io_uring: add support for shutdown(2)")

interacting with commit

  dba4a9256bb4 ("net: Remove the err argument from sock_from_file")

from the bpf-next tree.

I have applied the following merge fix patch.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 7 Dec 2020 14:04:10 +1100
Subject: [PATCH] fixup for "net: Remove the err argument from sock_from_fil=
e"

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

diff --git a/fs/io_uring.c b/fs/io_uring.c
index cd997264dbab..91d08408f1fe 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -3779,9 +3779,9 @@ static int io_shutdown(struct io_kiocb *req, bool for=
ce_nonblock)
 	if (force_nonblock)
 		return -EAGAIN;
=20
-	sock =3D sock_from_file(req->file, &ret);
+	sock =3D sock_from_file(req->file);
 	if (unlikely(!sock))
-		return ret;
+		return -ENOTSOCK;
=20
 	ret =3D __sys_shutdown_sock(sock, req->shutdown.how);
 	io_req_complete(req, ret);
--=20
2.29.2

--=20
Cheers,
Stephen Rothwell

--Sig_/5kRkZNS/rNEXgq/a/ECeDM6
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl/NnP8ACgkQAVBC80lX
0Gy0WQf9GaIM5CBSqUjd7N8Mw2U6mjQytrpDmJxXIlAEOic/wBwRrwkQBzjYm4Bh
qW68SyvoswdL/oYgw3N07QXs3Ktf7P0f3Ul5w70ugh0rHVMW6Q7E7dnuwtxRPCI6
qKKyBe0yXMHj/jJLSP6L4ki+N5ltUdULO3V22XrqPGbYt0xBs1BSXn3nYlQEHn8L
MwX8O69VO260FJHPz6+7MglxFW7df2WaRBsprGqfUHMY6QDVcENafpIu9wWyinRH
lhyCL09pO0l4S21N6JXbJCUbXdY4bDS3EC+fgd3t5FpIzCkCy8XGwlywTmVBc/ow
2VKP4fiZVOEsoxpbeHA6Bl41dZYeHw==
=ds5/
-----END PGP SIGNATURE-----

--Sig_/5kRkZNS/rNEXgq/a/ECeDM6--