lkml.org 
[lkml]   [2021]   [Sep]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH net-next v4 5/6] af_vsock: rename variables in receive loop
    Date
    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
    \
     
     \ /
      Last update: 2021-09-03 08:17    [W:4.392 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site