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

vsock: rename vsock_has_data() 



vsock_has_data() is used only by STREAM and SEQPACKET sockets,
so let's rename it to vsock_connectible_has_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 7437a223

net/vmw_vsock/af_vsock.c

+2 −2
Original line number Diff line number Diff line
@@ -860,7 +860,7 @@ s64 vsock_stream_has_data(struct vsock_sock *vsk) 
}

EXPORT_SYMBOL_GPL(vsock_stream_has_data);



static s64 vsock_has_data(struct vsock_sock *vsk)

static s64 vsock_connectible_has_data(struct vsock_sock *vsk)

{

	struct sock *sk = sk_vsock(vsk);
@@ -1880,7 +1880,7 @@ static int vsock_wait_data(struct sock *sk, struct wait_queue_entry *wait, 
	err = 0;

	transport = vsk->transport;



	while ((data = vsock_has_data(vsk)) == 0) {

	while ((data = vsock_connectible_has_data(vsk)) == 0) {

		prepare_to_wait(sk_sleep(sk), wait, TASK_INTERRUPTIBLE);



		if (sk->sk_err != 0 ||