diff options
| author | David S. Miller <davem@davemloft.net> | 2021-06-18 12:59:53 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-06-18 12:59:53 -0700 |
| commit | 0d1ad06af239179d336f6eb0ef3ca40f70ce09ce (patch) | |
| tree | 6cb49e7b655cc363f24a5d479349c6d2a6dba712 /net/vmw_vsock/af_vsock.c | |
| parent | 7437a2230e3993bb374fe546e5137b94b3ec302b (diff) | |
| parent | 91aa49a8fa0ffa66966be275b2575009cc12fd3b (diff) | |
Merge branch 'csock-seqpoacket-small-fixes'
Stefano Garzarella says:
====================
vsock: small fixes for seqpacket support
This series contains few patches to clean up a bit the code
of seqpacket recently merged in the net-next tree.
No functionality changes.
====================
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Diffstat (limited to 'net/vmw_vsock/af_vsock.c')
| -rw-r--r-- | net/vmw_vsock/af_vsock.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c index 67954afef4e1..21ccf450e249 100644 --- a/net/vmw_vsock/af_vsock.c +++ b/net/vmw_vsock/af_vsock.c @@ -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); @@ -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; @@ -1880,7 +1881,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 || @@ -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; |