Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp1471574pxj; Fri, 18 Jun 2021 07:52:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzgr8n4sUAAZ5gkCORxMIR+VqFnIUvpSaPBCpRhUibxeyFSUVZCRTPn+fE+mJOaU345C/kk X-Received: by 2002:a05:6e02:13ad:: with SMTP id h13mr7695888ilo.128.1624027976789; Fri, 18 Jun 2021 07:52:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624027976; cv=none; d=google.com; s=arc-20160816; b=Vuo+9VUAL++WSv3CoRRoKsYIjklHnXiYGybjnnC0CEsQ61F0aAXmxfcpcT7QhMafDu /e68FEq+jFjJJ5cI89atZh5Xs+1x8qSWRI1SdUtxU0gNOqgGgDcQT4MGPP820lkF/oPg hSwJmC0BPaO9oqIG4LKt0LifAHSVKQKu0UFTp8JKkWCK+J87QX658+b1VPnPhJH57KL8 A9KozwivqZhTHSMThlQ7PblOwUycTHAaKEuFeyMMMJxbIa8MXdSwLs4f21JS7Gx4gPho SM20NOkTaTtvj3qypvecGutvCeLf4S67Dhntm234Iwe/ZA2WDI5SYAyQHWxrZxvVQ6X2 h5SA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-language:content-transfer-encoding :in-reply-to:mime-version:user-agent:date:message-id:from:references :cc:to:subject:dkim-signature; bh=xRaEXBSxr/v/WILr8C5XaDGBVicfLFl6vBjSaTvqlwg=; b=mkZtv/UVigWrj5gjS2FpVOMAcSbY6l8sYDFMlCtQmtVxCFyQi+hRsIytuK3V9Ax/nc xFkRbMmht2XyWIDVDTD7Aag4Pnaj2jk2BPWVcXFi/scAmtd901fLrWcyXxLz4Nhl1iki mRJXgDY8OGLvpcHsaRA4FithuzPLi/jDaQBHQ3IwhbwKSHfBv9NQNhl1VQsFUfX/vVw8 lXkcIPcmFfsex1d2x5JAQzKiXWBfhXCaNmTS1rsIAQyCMBtxcjY3Yhi95SVQG6rNtnva WIqmMj1OTVa3FZQm2UtoQDmGO7SKxgZKGWKSwTJrpUKM7mh84edgccKxcly/8lEywNor wabQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kaspersky.com header.s=mail202102 header.b=Dt50J71W; 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; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=kaspersky.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id d4si9074171iom.64.2021.06.18.07.52.44; Fri, 18 Jun 2021 07:52:56 -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=pass header.i=@kaspersky.com header.s=mail202102 header.b=Dt50J71W; 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; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=kaspersky.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234730AbhFROxF (ORCPT + 99 others); Fri, 18 Jun 2021 10:53:05 -0400 Received: from mx13.kaspersky-labs.com ([91.103.66.164]:62696 "EHLO mx13.kaspersky-labs.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234558AbhFROxE (ORCPT ); Fri, 18 Jun 2021 10:53:04 -0400 Received: from relay13.kaspersky-labs.com (unknown [127.0.0.10]) by relay13.kaspersky-labs.com (Postfix) with ESMTP id 4F02B520EA1; Fri, 18 Jun 2021 17:50:53 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kaspersky.com; s=mail202102; t=1624027853; bh=xRaEXBSxr/v/WILr8C5XaDGBVicfLFl6vBjSaTvqlwg=; h=Subject:To:From:Message-ID:Date:MIME-Version:Content-Type; b=Dt50J71Wf/ay9I25JYzp4qjqLX2UwZYr2JSBxWjoKprGv2KjsiXHVUAhv8BgxZ69j d2BdjY27UmFEDkx8diL5OItbpnbCYpdU1t8I8KfEey+Fceicb0KLTZo+jE2ly00Uyi v7H1Ss35D/skvPkSBQAOejNtlU5J/LSF4XfjxzP0f+29uSLjL38irJZcNjy442RzVl BOEq5GPvAgN3wV12u4VPdRkGBVZiY612FcxQa1fzVNTLpl+Er6KWscIcHPwt1c7HZ2 iXKaiHDYLaVnC4LI5x8XJQrMsxuAObqEeymUersA2pamuXuhTsgIRqWmJG/PMs4J/L tv/zS3pdu34Kw== Received: from mail-hq2.kaspersky.com (unknown [91.103.66.206]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client CN "mail-hq2.kaspersky.com", Issuer "Kaspersky MailRelays CA G3" (verified OK)) by mailhub13.kaspersky-labs.com (Postfix) with ESMTPS id 3154B520E97; Fri, 18 Jun 2021 17:50:52 +0300 (MSK) Received: from [10.16.171.77] (10.64.68.129) by hqmailmbx3.avp.ru (10.64.67.243) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2176.14; Fri, 18 Jun 2021 17:50:51 +0300 Subject: Re: [PATCH net-next 2/3] vsock: rename vsock_wait_data() To: Stefano Garzarella , "netdev@vger.kernel.org" CC: "kvm@vger.kernel.org" , Jakub Kicinski , "virtualization@lists.linux-foundation.org" , "David S. Miller" , Stefan Hajnoczi , "linux-kernel@vger.kernel.org" References: <20210618133526.300347-1-sgarzare@redhat.com> <20210618133526.300347-3-sgarzare@redhat.com> From: Arseny Krasnov Message-ID: Date: Fri, 18 Jun 2021 17:50:51 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20210618133526.300347-3-sgarzare@redhat.com> Content-Type: text/plain; charset="koi8-r" Content-Transfer-Encoding: 7bit Content-Language: en-US X-Originating-IP: [10.64.68.129] X-ClientProxiedBy: hqmailmbx3.avp.ru (10.64.67.243) To hqmailmbx3.avp.ru (10.64.67.243) X-KSE-ServerInfo: hqmailmbx3.avp.ru, 9 X-KSE-AntiSpam-Interceptor-Info: scan successful X-KSE-AntiSpam-Version: 5.9.20, Database issued on: 06/18/2021 14:29:51 X-KSE-AntiSpam-Status: KAS_STATUS_NOT_DETECTED X-KSE-AntiSpam-Method: none X-KSE-AntiSpam-Rate: 0 X-KSE-AntiSpam-Info: Lua profiles 164482 [Jun 18 2021] X-KSE-AntiSpam-Info: Version: 5.9.20.0 X-KSE-AntiSpam-Info: Envelope from: arseny.krasnov@kaspersky.com X-KSE-AntiSpam-Info: LuaCore: 448 448 71fb1b37213ce9a885768d4012c46ac449c77b17 X-KSE-AntiSpam-Info: {Tracking_from_domain_doesnt_match_to} X-KSE-AntiSpam-Info: d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;127.0.0.199:7.1.2;kaspersky.com:7.1.1 X-KSE-AntiSpam-Info: Rate: 0 X-KSE-AntiSpam-Info: Status: not_detected X-KSE-AntiSpam-Info: Method: none X-KSE-Antiphishing-Info: Clean X-KSE-Antiphishing-ScanningType: Deterministic X-KSE-Antiphishing-Method: None X-KSE-Antiphishing-Bases: 06/18/2021 14:32:00 X-KSE-AttachmentFiltering-Interceptor-Info: no applicable attachment filtering rules found X-KSE-Antivirus-Interceptor-Info: scan successful X-KSE-Antivirus-Info: Clean, bases: 18.06.2021 12:17:00 X-KSE-BulkMessagesFiltering-Scan-Result: InTheLimit X-KSE-AttachmentFiltering-Interceptor-Info: no applicable attachment filtering rules found X-KSE-BulkMessagesFiltering-Scan-Result: InTheLimit X-KLMS-Rule-ID: 52 X-KLMS-Message-Action: clean X-KLMS-AntiSpam-Status: not scanned, disabled by settings X-KLMS-AntiSpam-Interceptor-Info: not scanned X-KLMS-AntiPhishing: Clean, bases: 2021/06/18 13:10:00 X-KLMS-AntiVirus: Kaspersky Security for Linux Mail Server, version 8.0.3.30, bases: 2021/06/18 12:17:00 #16756757 X-KLMS-AntiVirus-Status: Clean, skipped Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 18.06.2021 16:35, Stefano Garzarella wrote: > vsock_wait_data() is used only by STREAM and SEQPACKET sockets, > so let's rename it to vsock_connectible_wait_data(), using the same > nomenclature (connectible) used in other functions after the > introduction of SEQPACKET. > > Signed-off-by: Stefano Garzarella > --- > net/vmw_vsock/af_vsock.c | 14 ++++++++------ > 1 file changed, 8 insertions(+), 6 deletions(-) > > diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c > index de8249483081..21ccf450e249 100644 > --- a/net/vmw_vsock/af_vsock.c > +++ b/net/vmw_vsock/af_vsock.c > @@ -1866,10 +1866,11 @@ static int vsock_connectible_sendmsg(struct socket *sock, struct msghdr *msg, > return err; > } > > -static int vsock_wait_data(struct sock *sk, struct wait_queue_entry *wait, > - long timeout, > - struct vsock_transport_recv_notify_data *recv_data, > - size_t target) > +static int vsock_connectible_wait_data(struct sock *sk, > + struct wait_queue_entry *wait, > + long timeout, > + struct vsock_transport_recv_notify_data *recv_data, > + size_t target) > { > const struct vsock_transport *transport; > struct vsock_sock *vsk; > @@ -1967,7 +1968,8 @@ static int __vsock_stream_recvmsg(struct sock *sk, struct msghdr *msg, > while (1) { > ssize_t read; > > - err = vsock_wait_data(sk, &wait, timeout, &recv_data, target); > + err = vsock_connectible_wait_data(sk, &wait, timeout, > + &recv_data, target); > if (err <= 0) > break; > > @@ -2022,7 +2024,7 @@ static int __vsock_seqpacket_recvmsg(struct sock *sk, struct msghdr *msg, > > timeout = sock_rcvtimeo(sk, flags & MSG_DONTWAIT); > > - err = vsock_wait_data(sk, &wait, timeout, NULL, 0); > + err = vsock_connectible_wait_data(sk, &wait, timeout, NULL, 0); > if (err <= 0) > goto out; > LGTM