From mboxrd@z Thu Jan 1 00:00:00 1970 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=-16.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, 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=ham 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 18CC3C4338F for ; Wed, 11 Aug 2021 09:09:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F04E160FC0 for ; Wed, 11 Aug 2021 09:09:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236599AbhHKJJ7 (ORCPT ); Wed, 11 Aug 2021 05:09:59 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:58597 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235902AbhHKJJ7 (ORCPT ); Wed, 11 Aug 2021 05:09:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1628672975; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=MsN+R/kO/sC5UDsvg+cIZCQho4j0aHbcm1E8m8xMoHI=; b=Y/3A+zGV2Z8Oy4FxnskduYhm7DD+LHXbjZvqIYP0YrVripAY68OyW/Hv1NR/1damZeIsMt 1YVyjvnb7d+cwZuAAsfEnKbA0j5NGjZHfha6J1SvQsFqfh+/FSPVodWezqhRJ0eibf6dKj nmAa0Mt6LgwUhluSVqlCVnCg3VHWTRw= Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-478-cXF9UrO-MvCZC1isFaw-vQ-1; Wed, 11 Aug 2021 05:09:34 -0400 X-MC-Unique: cXF9UrO-MvCZC1isFaw-vQ-1 Received: by mail-ej1-f69.google.com with SMTP id v3-20020a1709063383b02905b4d1d1e27cso418025eja.19 for ; Wed, 11 Aug 2021 02:09:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=MsN+R/kO/sC5UDsvg+cIZCQho4j0aHbcm1E8m8xMoHI=; b=RAii3UpIATtnQYUQJcHMcXY27cblF8roxBzV0kZt2Exl0WVAUwWXKR8ViT6ziYrB/L kguKyj4iUXgOtSNJ9lZak6I1jdQ9U8sT0XpmpPj2O6wCQuAH4IVfqoSCD1HM/nZrEAVK ujykbLBou6rtyXneiBvX+tiSbsgy6ExDW99XD8LZIYQggYC7ymKZyuP7ANXZr2b3C8J6 pfW54TLUcyzjfV0tJdwotnZRpMatqvFJ1/r/g/N8ALifh5V/akFuQWy7PDXWV5eeh77K Bqj8VZv6LVw4H9yDCMbt4r6GHLvrVDy1tRIcTe3siErzbslDtzZIS+HsJ+fZ8nbK5DkE eXCQ== X-Gm-Message-State: AOAM533GTtT0z/B5BUpLti6PExLlvgupsZ5soIvkKozUM+deOFHmVg44 ksL7SRuKn2sUP6bd3CccLFGJ+ISKGZmX4VCDc0qPqrSknpjEa8J6t8SyO1kUYoed8LPO+yJ7Z6K vs4lXF29npGmjc1iM X-Received: by 2002:a17:907:d09:: with SMTP id gn9mr2650715ejc.447.1628672972942; Wed, 11 Aug 2021 02:09:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzlojArCBZxB67seYKuyq7LpLZcorxhEMExKVIxApxzWQgjZz0IoO7BwSDRdptosrXZNyCPQA== X-Received: by 2002:a17:907:d09:: with SMTP id gn9mr2650687ejc.447.1628672972737; Wed, 11 Aug 2021 02:09:32 -0700 (PDT) Received: from steredhat (a-nu5-14.tin.it. [212.216.181.13]) by smtp.gmail.com with ESMTPSA id v24sm7840824edt.41.2021.08.11.02.09.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Aug 2021 02:09:32 -0700 (PDT) Date: Wed, 11 Aug 2021 11:09:30 +0200 From: Stefano Garzarella To: Arseny Krasnov Cc: Stefan Hajnoczi , "Michael S. Tsirkin" , Jason Wang , "David S. Miller" , Jakub Kicinski , Colin Ian King , Norbert Slusarek , Andra Paraschiv , kvm@vger.kernel.org, virtualization@lists.linux-foundation.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, stsp2@yandex.ru, oxffffaa@gmail.com Subject: Re: [RFC PATCH v2 4/5] af_vsock: rename variables in receive loop Message-ID: <20210811090930.mormg24hnnle7qq3@steredhat> References: <20210810113901.1214116-1-arseny.krasnov@kaspersky.com> <20210810114103.1214897-1-arseny.krasnov@kaspersky.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <20210810114103.1214897-1-arseny.krasnov@kaspersky.com> Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Tue, Aug 10, 2021 at 02:41:00PM +0300, Arseny Krasnov wrote: >Record is supported via MSG_EOR flag, while current logic operates >with message, so rename variables from 'record' to 'message'. > >Signed-off-by: Arseny Krasnov >--- > net/vmw_vsock/af_vsock.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > >diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c >index 3e02cc3b24f8..e2c0cfb334d2 100644 >--- a/net/vmw_vsock/af_vsock.c >+++ b/net/vmw_vsock/af_vsock.c >@@ -2014,7 +2014,7 @@ static int __vsock_seqpacket_recvmsg(struct sock *sk, struct msghdr *msg, > { > const struct vsock_transport *transport; > struct vsock_sock *vsk; >- ssize_t record_len; >+ ssize_t msg_len; > long timeout; > int err = 0; > DEFINE_WAIT(wait); >@@ -2028,9 +2028,9 @@ static int __vsock_seqpacket_recvmsg(struct sock *sk, struct msghdr *msg, > if (err <= 0) > goto out; > >- record_len = transport->seqpacket_dequeue(vsk, msg, flags); >+ msg_len = transport->seqpacket_dequeue(vsk, msg, flags); > >- if (record_len < 0) { >+ if (msg_len < 0) { > err = -ENOMEM; > goto out; > } >@@ -2044,14 +2044,14 @@ static int __vsock_seqpacket_recvmsg(struct sock *sk, struct msghdr *msg, > * packet. > */ > if (flags & MSG_TRUNC) >- err = record_len; >+ err = msg_len; > else > err = len - msg_data_left(msg); > > /* Always set MSG_TRUNC if real length of packet is > * bigger than user's buffer. > */ >- if (record_len > len) >+ if (msg_len > len) > msg->msg_flags |= MSG_TRUNC; > } > >-- >2.25.1 > Reviewed-by: Stefano Garzarella