Commit 0de5b2e6 authored by Stefano Garzarella's avatar Stefano Garzarella Committed by David S. Miller
Browse files

vsock: rename vsock_wait_data() 



vsock_wait_data() is used only by STREAM and SEQPACKET sockets,
so let's rename it to vsock_connectible_wait_data(), using the same
nomenclature (connectible) used in other functions after the
introduction of SEQPACKET.

Signed-off-by: default avatarStefano Garzarella <sgarzare@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cc97141a

net/vmw_vsock/af_vsock.c

+8 −6
Original line number Diff line number Diff line
@@ -1866,7 +1866,8 @@ static int vsock_connectible_sendmsg(struct socket *sock, struct msghdr *msg, 
	return err;

}



static int vsock_wait_data(struct sock *sk, struct wait_queue_entry *wait,

static int vsock_connectible_wait_data(struct sock *sk,

				       struct wait_queue_entry *wait,

				       long timeout,

				       struct vsock_transport_recv_notify_data *recv_data,

				       size_t target)
@@ -1967,7 +1968,8 @@ static int __vsock_stream_recvmsg(struct sock *sk, struct msghdr *msg, 
	while (1) {

		ssize_t read;



		err = vsock_wait_data(sk, &wait, timeout, &recv_data, target);

		err = vsock_connectible_wait_data(sk, &wait, timeout,

						  &recv_data, target);

		if (err <= 0)

			break;
@@ -2022,7 +2024,7 @@ static int __vsock_seqpacket_recvmsg(struct sock *sk, struct msghdr *msg, 


	timeout = sock_rcvtimeo(sk, flags & MSG_DONTWAIT);



	err = vsock_wait_data(sk, &wait, timeout, NULL, 0);

	err = vsock_connectible_wait_data(sk, &wait, timeout, NULL, 0);

	if (err <= 0)

		goto out;