From: Florent Revest <revest@chromium.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
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@google.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the block tree
Date: Mon, 07 Dec 2020 21:09:59 +0100 [thread overview]
Message-ID: <046e725cf72ddae459cc9f5624402a1590307524.camel@chromium.org> (raw)
In-Reply-To: <20201207140951.4c04f26f@canb.auug.org.au>
On Mon, 2020-12-07 at 14:09 +1100, Stephen Rothwell wrote:
> 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 = 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_file"
>
> 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 force_nonblock)
> if (force_nonblock)
> return -EAGAIN;
>
> - sock = sock_from_file(req->file, &ret);
> + sock = sock_from_file(req->file);
> if (unlikely(!sock))
> - return ret;
> + return -ENOTSOCK;
>
> ret = __sys_shutdown_sock(sock, req->shutdown.how);
> io_req_complete(req, ret);
> --
> 2.29.2
Thanks Stephen, this looks good to me.
next prev parent reply other threads:[~2020-12-07 20:10 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-07 3:09 linux-next: build failure after merge of the block tree Stephen Rothwell
2020-12-07 20:09 ` Florent Revest [this message]
2020-12-14 20:29 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2017-04-18 3:02 Stephen Rothwell
2017-05-02 1:07 ` Stephen Rothwell
2017-05-02 1:09 ` Jens Axboe
2017-05-02 1:37 ` Stephen Rothwell
2017-05-02 1:45 ` Jens Axboe
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=046e725cf72ddae459cc9f5624402a1590307524.camel@chromium.org \
--to=revest@chromium.org \
--cc=ast@kernel.org \
--cc=axboe@kernel.dk \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=revest@google.com \
--cc=sfr@canb.auug.org.au \
/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).