Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp967422ybt; Fri, 26 Jun 2020 16:34:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyIgJOUNU275801Z89HcKzQO5HEwgCYrKc3SPm6HrdZqBXIF2ORU7Pu3HmnF7HAsZ5W3Zh2 X-Received: by 2002:aa7:c245:: with SMTP id y5mr5989251edo.189.1593214448826; Fri, 26 Jun 2020 16:34:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593214448; cv=none; d=google.com; s=arc-20160816; b=NL0Vp2xz1qXs8KqC40LuUVLiXqlGJc7dGn/+psyT5OSGuhO9P08jDnGQDDbTgkm80G Dtn2zOZVXEfEBMn4iIemS2kAaaViu2DbaVZHLSzZBjckrU7I83j+I6BhlRPKev3fNOJQ 0mBgzkReyBeYNZioQpl4o1osjndivS/B/X65aorilHw0Dg7Q1IN+mNF+R2YFjwaoMQD9 DTJC34O7AVAT+GxKGl+U7Ey/VaQDbCtuXqKtxR99uemVC8zdUGyxM2Ziu++x5TyLfLci 8PavUoxti3/3TULNvWlhqmUyuCPQO0xinUkWtVWMtt2JK5+qPFetSXyUX1OVrqK/pbR8 KYXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :content-language:mime-version:user-agent:date:message-id:subject :from:to:dkim-signature; bh=FFnZ2DH3BBsvpUYqMMKOpb6IQpnDbi/NHQDeFMlmgCk=; b=LQ5eQfKGg10gnr0o2IWpa3VaMwt4IVRm/uMrF2EMqNl1y5WJ+gmvDNAicUlqxGNu7v +IAp71ZRIJ4HFuyGZHhSJwuzxfilDjraQkI6v0/WQ4+Gblu9WcYb+oHI5qbDbqoRdMi1 C5xIldPV7hjkUGkE+HcHxybWLoOgHTAXHgwDjmZ5WSjLqtrojB5xQGXBvn/mOvokc6Z8 selyN/v5xIR2Wp/qH1nw4WIOqqOUJ2HqryHNbZsAzhQ3IGQAgHnRNPSVzRuU+8y8RS5c gTCJvacoB/Tn0Vw0qYZ+vy0h761YKoBclxs/8q/c6OYD59V8InvVFfVjE9xhoYnMarOP 9t9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=casper.20170209 header.b=XPUXN5CI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id k4si16889839edn.572.2020.06.26.16.33.45; Fri, 26 Jun 2020 16:34:08 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=fail header.i=@infradead.org header.s=casper.20170209 header.b=XPUXN5CI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726426AbgFZXdS (ORCPT + 99 others); Fri, 26 Jun 2020 19:33:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42730 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725883AbgFZXdR (ORCPT ); Fri, 26 Jun 2020 19:33:17 -0400 Received: from casper.infradead.org (unknown [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4FE40C03E979; Fri, 26 Jun 2020 16:33:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:Content-Type: MIME-Version:Date:Message-ID:Subject:From:To:Sender:Reply-To:Cc:Content-ID: Content-Description:In-Reply-To:References; bh=FFnZ2DH3BBsvpUYqMMKOpb6IQpnDbi/NHQDeFMlmgCk=; b=XPUXN5CIj90hvXjTh5U83Qdt8J 9fbINVs58U//tuC00nBGBIzosle9QqNlYwGDoskhdG41WvFeW0PDP/eCckQs3w4fWOHfvWQkcp884 ojXcggAVFQknGn0HthlbRVGIrqf6o6UkEuOW9ur/ZJ6m5MoNS6zqBJ56FaVL5t89+kD5dPIjg0QYF WLrU/LVXIpEz7uO646A9a7kTvcgLwAcsrzSrUrmv1xuAT0C+SURafIK+Ej73Ww0frbSRWEegIm5W1 C1ylsja6bWhTsqLejDDYpljK0+/F09sLlbaNfL9vnPc3LQN7nf2jgjw9ClK+q+3oYczOxc71NPSB/ GoKRLQ3A==; Received: from [2601:1c0:6280:3f0::19c2] by casper.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1joxq3-0008I6-If; Fri, 26 Jun 2020 23:32:59 +0000 To: LKML , axboe , io-uring@vger.kernel.org From: Randy Dunlap Subject: [PATCH] io_uring: fix function args for !CONFIG_NET Message-ID: Date: Fri, 26 Jun 2020 16:32:50 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.9.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Randy Dunlap Fix build errors when CONFIG_NET is not set/enabled: ../fs/io_uring.c:5472:10: error: too many arguments to function ‘io_sendmsg’ ../fs/io_uring.c:5474:10: error: too many arguments to function ‘io_send’ ../fs/io_uring.c:5484:10: error: too many arguments to function ‘io_recvmsg’ ../fs/io_uring.c:5486:10: error: too many arguments to function ‘io_recv’ ../fs/io_uring.c:5510:9: error: too many arguments to function ‘io_accept’ ../fs/io_uring.c:5518:9: error: too many arguments to function ‘io_connect’ Signed-off-by: Randy Dunlap Cc: Jens Axboe Cc: io-uring@vger.kernel.org --- fs/io_uring.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) --- mmotm-2020-0625-2036.orig/fs/io_uring.c +++ mmotm-2020-0625-2036/fs/io_uring.c @@ -4315,12 +4315,14 @@ static int io_sendmsg_prep(struct io_kio return -EOPNOTSUPP; } -static int io_sendmsg(struct io_kiocb *req, bool force_nonblock) +static int io_sendmsg(struct io_kiocb *req, bool force_nonblock, + struct io_comp_state *cs) { return -EOPNOTSUPP; } -static int io_send(struct io_kiocb *req, bool force_nonblock) +static int io_send(struct io_kiocb *req, bool force_nonblock, + struct io_comp_state *cs) { return -EOPNOTSUPP; } @@ -4331,12 +4333,14 @@ static int io_recvmsg_prep(struct io_kio return -EOPNOTSUPP; } -static int io_recvmsg(struct io_kiocb *req, bool force_nonblock) +static int io_recvmsg(struct io_kiocb *req, bool force_nonblock, + struct io_comp_state *cs) { return -EOPNOTSUPP; } -static int io_recv(struct io_kiocb *req, bool force_nonblock) +static int io_recv(struct io_kiocb *req, bool force_nonblock, + struct io_comp_state *cs) { return -EOPNOTSUPP; } @@ -4346,7 +4350,8 @@ static int io_accept_prep(struct io_kioc return -EOPNOTSUPP; } -static int io_accept(struct io_kiocb *req, bool force_nonblock) +static int io_accept(struct io_kiocb *req, bool force_nonblock, + struct io_comp_state *cs) { return -EOPNOTSUPP; } @@ -4356,7 +4361,8 @@ static int io_connect_prep(struct io_kio return -EOPNOTSUPP; } -static int io_connect(struct io_kiocb *req, bool force_nonblock) +static int io_connect(struct io_kiocb *req, bool force_nonblock, + struct io_comp_state *cs) { return -EOPNOTSUPP; }