linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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>,
	Jorgen Hansen <jhansen@vmware.com>,
	Andra Paraschiv <andraprs@amazon.com>,
	Norbert Slusarek <nslusarek@gmx.net>,
	Colin Ian King <colin.king@canonical.com>
Cc: <kvm@vger.kernel.org>,
	<virtualization@lists.linux-foundation.org>,
	<netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
	<oxffffaa@gmail.com>
Subject: [RFC PATCH v1 5/7] af_vsock: rename variables in receive loop
Date: Mon, 26 Jul 2021 19:34:06 +0300	[thread overview]
Message-ID: <20210726163409.2589994-1-arseny.krasnov@kaspersky.com> (raw)
In-Reply-To: <20210726163137.2589102-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>
---
 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


  parent reply	other threads:[~2021-07-26 16:40 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-26 16:31 [RFC PATCH v1 0/7] virtio/vsock: introduce MSG_EOR flag for SEQPACKET Arseny Krasnov
2021-07-26 16:33 ` [RFC PATCH v1 1/7] virtio/vsock: add 'VIRTIO_VSOCK_SEQ_EOM' bit Arseny Krasnov
2021-08-06  7:18   ` Stefano Garzarella
2021-07-26 16:33 ` [RFC PATCH v1 2/7] vsock: rename implementation from 'record' to 'message' Arseny Krasnov
2021-08-06  7:20   ` Stefano Garzarella
2021-07-26 16:33 ` [RFC PATCH v1 3/7] vhost/vsock: support MSG_EOR bit processing Arseny Krasnov
2021-08-06  7:28   ` Stefano Garzarella
2021-08-06  8:40     ` Arseny Krasnov
2021-08-06  8:47       ` Stefano Garzarella
2021-07-26 16:33 ` [RFC PATCH v1 4/7] virito/vsock: " Arseny Krasnov
2021-07-26 16:34 ` Arseny Krasnov [this message]
2021-07-26 16:34 ` [RFC PATCH v1 6/7] vsock_test: update message bounds test for MSG_EOR Arseny Krasnov
2021-07-26 16:34 ` [RFC PATCH v1 7/7] vsock_test: 'SO_RCVTIMEO' test for SEQPACKET Arseny Krasnov
2021-07-27  7:59 ` [RFC PATCH v1 0/7] virtio/vsock: introduce MSG_EOR flag " Stefano Garzarella
2021-07-27  9:34   ` [MASSMAIL KLMS] " Arseny Krasnov
2021-07-27  9:58     ` Stefano Garzarella
2021-07-27 12:35       ` [MASSMAIL KLMS] " Arseny Krasnov
2021-08-04 12:57 ` Stefano Garzarella
2021-08-05  8:33   ` Arseny Krasnov
2021-08-05  9:06     ` Stefano Garzarella
2021-08-05  9:21       ` [!!Mass Mail KSE][MASSMAIL KLMS] " Arseny Krasnov
2021-08-06  7:16         ` Stefano Garzarella

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=20210726163409.2589994-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=jhansen@vmware.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.com \
    --cc=sgarzare@redhat.com \
    --cc=stefanha@redhat.com \
    --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).