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

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
...@@ -1866,10 +1866,11 @@ static int vsock_connectible_sendmsg(struct socket *sock, struct msghdr *msg, ...@@ -1866,10 +1866,11 @@ static int vsock_connectible_sendmsg(struct socket *sock, struct msghdr *msg,
return err; return err;
} }
static int vsock_wait_data(struct sock *sk, struct wait_queue_entry *wait, static int vsock_connectible_wait_data(struct sock *sk,
long timeout, struct wait_queue_entry *wait,
struct vsock_transport_recv_notify_data *recv_data, long timeout,
size_t target) struct vsock_transport_recv_notify_data *recv_data,
size_t target)
{ {
const struct vsock_transport *transport; const struct vsock_transport *transport;
struct vsock_sock *vsk; struct vsock_sock *vsk;
...@@ -1967,7 +1968,8 @@ static int __vsock_stream_recvmsg(struct sock *sk, struct msghdr *msg, ...@@ -1967,7 +1968,8 @@ static int __vsock_stream_recvmsg(struct sock *sk, struct msghdr *msg,
while (1) { while (1) {
ssize_t read; 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) if (err <= 0)
break; break;
...@@ -2022,7 +2024,7 @@ static int __vsock_seqpacket_recvmsg(struct sock *sk, struct msghdr *msg, ...@@ -2022,7 +2024,7 @@ static int __vsock_seqpacket_recvmsg(struct sock *sk, struct msghdr *msg,
timeout = sock_rcvtimeo(sk, flags & MSG_DONTWAIT); 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) if (err <= 0)
goto out; goto out;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment