diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2022-11-03 12:49:31 +0300 |
|---|---|---|
| committer | Paolo Abeni <pabeni@redhat.com> | 2022-11-03 12:49:32 +0300 |
| commit | 715aee0fde73d5ebac58e2339cef14f2da42e9e3 (patch) | |
| tree | 39f15fff8291acfde6a706a7b9206aeece8e4110 | |
| parent | 768b3c745fe5789f2430bdab02f35a9ad1148d97 (diff) | |
| parent | 466a85336fee6e3b35eb97b8405a28302fd25809 (diff) | |
| download | linux-715aee0fde73d5ebac58e2339cef14f2da42e9e3.tar.xz | |
Merge branch 'vsock-remove-an-unused-variable-and-fix-infinite-sleep'
Dexuan Cui says:
====================
vsock: remove an unused variable and fix infinite sleep
Patch 1 removes the unused 'wait' variable.
Patch 2 fixes an infinite sleep issue reported by a hv_sock user.
====================
Link: https://lore.kernel.org/r/20221101021706.26152-1-decui@microsoft.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
| -rw-r--r-- | net/vmw_vsock/af_vsock.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c index ee418701cdee..884eca7f6743 100644 --- a/net/vmw_vsock/af_vsock.c +++ b/net/vmw_vsock/af_vsock.c @@ -1905,8 +1905,11 @@ static int vsock_connectible_wait_data(struct sock *sk, err = 0; transport = vsk->transport; - while ((data = vsock_connectible_has_data(vsk)) == 0) { + while (1) { prepare_to_wait(sk_sleep(sk), wait, TASK_INTERRUPTIBLE); + data = vsock_connectible_has_data(vsk); + if (data != 0) + break; if (sk->sk_err != 0 || (sk->sk_shutdown & RCV_SHUTDOWN) || @@ -2092,8 +2095,6 @@ vsock_connectible_recvmsg(struct socket *sock, struct msghdr *msg, size_t len, const struct vsock_transport *transport; int err; - DEFINE_WAIT(wait); - sk = sock->sk; vsk = vsock_sk(sk); err = 0; |