Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

[linux-2.6-microblaze.git] / net / vmw_vsock / af_vsock.c

diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
index 3e02cc3..e2c0cfb 100644 (file)
--- 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;
        }