Skip to content

Commit 8fc92b7

Browse files
Arseny Krasnovmstsirkin
authored andcommitted
af_vsock: rename variables in receive loop
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 <[email protected]> Reviewed-by: Stefano Garzarella <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Michael S. Tsirkin <[email protected]>
1 parent 8d5ac87 commit 8fc92b7

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

net/vmw_vsock/af_vsock.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2014,7 +2014,7 @@ static int __vsock_seqpacket_recvmsg(struct sock *sk, struct msghdr *msg,
20142014
{
20152015
const struct vsock_transport *transport;
20162016
struct vsock_sock *vsk;
2017-
ssize_t record_len;
2017+
ssize_t msg_len;
20182018
long timeout;
20192019
int err = 0;
20202020
DEFINE_WAIT(wait);
@@ -2028,9 +2028,9 @@ static int __vsock_seqpacket_recvmsg(struct sock *sk, struct msghdr *msg,
20282028
if (err <= 0)
20292029
goto out;
20302030

2031-
record_len = transport->seqpacket_dequeue(vsk, msg, flags);
2031+
msg_len = transport->seqpacket_dequeue(vsk, msg, flags);
20322032

2033-
if (record_len < 0) {
2033+
if (msg_len < 0) {
20342034
err = -ENOMEM;
20352035
goto out;
20362036
}
@@ -2044,14 +2044,14 @@ static int __vsock_seqpacket_recvmsg(struct sock *sk, struct msghdr *msg,
20442044
* packet.
20452045
*/
20462046
if (flags & MSG_TRUNC)
2047-
err = record_len;
2047+
err = msg_len;
20482048
else
20492049
err = len - msg_data_left(msg);
20502050

20512051
/* Always set MSG_TRUNC if real length of packet is
20522052
* bigger than user's buffer.
20532053
*/
2054-
if (record_len > len)
2054+
if (msg_len > len)
20552055
msg->msg_flags |= MSG_TRUNC;
20562056
}
20572057

0 commit comments

Comments
 (0)