From patchwork Mon Dec 7 03:09:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 11954733 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 53EE0C19425 for ; Mon, 7 Dec 2020 03:10:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 22BD023358 for ; Mon, 7 Dec 2020 03:10:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728708AbgLGDKg (ORCPT ); Sun, 6 Dec 2020 22:10:36 -0500 Received: from bilbo.ozlabs.org ([203.11.71.1]:39345 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726482AbgLGDKf (ORCPT ); Sun, 6 Dec 2020 22:10:35 -0500 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4Cq7b36XfXz9sVs; Mon, 7 Dec 2020 14:09:51 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1607310593; bh=5bh4tlGoUL+1XncBIhF/LpWGb65TQqPGNgtGe+PXrV0=; h=Date:From:To:Cc:Subject:From; b=jxmi+mSGmjZITruorZ0kkMOF9O5pg0Vvo2xrLAVm2Q9Z9gAvfF0FvvoZVENeEgEWt MSFoC7P7inCFz83TsGqzyss4t6MIlGxTjYyiHiWRNckA1LMREDPasGybn6KwsxQfw8 z4J5Gawg1XRLDfDfo8j40i4qoUHUQO7peDRBtoJ1mo6CUKTq69ioIFCDPwIObRnaGU XbjhtiwZq93as04l1exa+SSFQihZ9z0rkPhi1IVyELPTBhhBFcfROAEOXDOxWLPfuO RBezhvI3oAIf/io4Gd2xO731hs3iyXcjR0u9zZTXp/FiQwpZq67gk7eZpVjV9V2OsF DUt8YOH9t5+Sw== Date: Mon, 7 Dec 2020 14:09:51 +1100 From: Stephen Rothwell To: Jens Axboe , Daniel Borkmann , Alexei Starovoitov , Networking Cc: David Miller , Jakub Kicinski , Florent Revest , Florent Revest , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: build failure after merge of the block tree Message-ID: <20201207140951.4c04f26f@canb.auug.org.au> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 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 --- 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);