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: Stefano Garzarella <sgarzare@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
index de82494..21ccf45 100644 (file)
--- a/net/vmw_vsock/af_vsock.c
+++ b/net/vmw_vsock/af_vsock.c
@@ -1866,10 +1866,11 @@ out:
        return err;
 }
 
-static int vsock_wait_data(struct sock *sk, struct wait_queue_entry *wait,
-                          long timeout,
-                          struct vsock_transport_recv_notify_data *recv_data,
-                          size_t target)
+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)
 {
        const struct vsock_transport *transport;
        struct vsock_sock *vsk;
@@ -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;