From: Arseny Krasnov <arseny.krasnov@kaspersky.com>
To: Stefan Hajnoczi <stefanha@redhat.com>,
Stefano Garzarella <sgarzare@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
Jason Wang <jasowang@redhat.com>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
Arseny Krasnov <arseny.krasnov@kaspersky.com>,
Andra Paraschiv <andraprs@amazon.com>,
Colin Ian King <colin.king@canonical.com>,
Norbert Slusarek <nslusarek@gmx.net>
Cc: <kvm@vger.kernel.org>,
<virtualization@lists.linux-foundation.org>,
<netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<stsp2@yandex.ru>, <oxffffaa@gmail.co>
Subject: [RFC PATCH v3 5/6] af_vsock: rename variables in receive loop
Date: Mon, 16 Aug 2021 11:52:34 +0300 [thread overview]
Message-ID: <20210816085237.4174476-1-arseny.krasnov@kaspersky.com> (raw)
In-Reply-To: <20210816085036.4173627-1-arseny.krasnov@kaspersky.com>
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 <arseny.krasnov@kaspersky.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
---
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
next prev parent reply other threads:[~2021-08-16 8:53 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-16 8:50 [RFC PATCH v3 0/6] virtio/vsock: introduce MSG_EOR flag for SEQPACKET Arseny Krasnov
2021-08-16 8:51 ` [RFC PATCH v3 1/6] virtio/vsock: rename 'EOR' to 'EOM' bit Arseny Krasnov
2021-08-24 9:52 ` Stefano Garzarella
2021-08-16 8:51 ` [RFC PATCH v3 2/6] virtio/vsock: add 'VIRTIO_VSOCK_SEQ_EOR' bit Arseny Krasnov
2021-08-24 9:53 ` Stefano Garzarella
2021-08-16 8:51 ` [RFC PATCH v3 3/6] vhost/vsock: support MSG_EOR bit processing Arseny Krasnov
2021-08-24 10:00 ` Stefano Garzarella
2021-08-16 8:52 ` [RFC PATCH v3 4/6] virtio/vsock: " Arseny Krasnov
2021-08-16 8:52 ` Arseny Krasnov [this message]
2021-08-16 8:53 ` [RFC PATCH v3 6/6] vsock_test: update message bounds test for MSG_EOR Arseny Krasnov
2021-08-23 18:41 ` [RFC PATCH v3 0/6] virtio/vsock: introduce MSG_EOR flag for SEQPACKET Arseny Krasnov
2021-08-24 10:05 ` Stefano Garzarella
2021-08-24 10:18 ` Arseny Krasnov
2021-08-24 10:31 ` Stefano Garzarella
2021-08-24 11:35 ` Arseny Krasnov
2021-08-30 5:26 ` Arseny Krasnov
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=20210816085237.4174476-1-arseny.krasnov@kaspersky.com \
--to=arseny.krasnov@kaspersky.com \
--cc=andraprs@amazon.com \
--cc=colin.king@canonical.com \
--cc=davem@davemloft.net \
--cc=jasowang@redhat.com \
--cc=kuba@kernel.org \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=nslusarek@gmx.net \
--cc=oxffffaa@gmail.co \
--cc=sgarzare@redhat.com \
--cc=stefanha@redhat.com \
--cc=stsp2@yandex.ru \
--cc=virtualization@lists.linux-foundation.org \
/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).