Flatten the function. Remove the nested block by inverting the condition:
return early on !timeout.
No functional change intended.
Suggested-by: Stefano Garzarella <sgarzare@xxxxxxxxxx>
Signed-off-by: Michal Luczaj <mhal@xxxxxxx>
---
net/vmw_vsock/virtio_transport_common.c | 36 ++++++++++++++++-----------------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c
index aeb7f3794f7cfc251dde878cb44fdcc54814c89c..73b6e7b437d950fd1cd1507f7dcc28780bd98a0b 100644
--- a/net/vmw_vsock/virtio_transport_common.c
+++ b/net/vmw_vsock/virtio_transport_common.c
@@ -1194,28 +1194,28 @@ static void virtio_transport_remove_sock(struct vsock_sock *vsk)
static void virtio_transport_wait_close(struct sock *sk, long timeout)
{
- if (timeout) {
- DEFINE_WAIT_FUNC(wait, woken_wake_function);
- ssize_t (*unsent)(struct vsock_sock *vsk);
- struct vsock_sock *vsk = vsock_sk(sk);
+ DEFINE_WAIT_FUNC(wait, woken_wake_function);
+ ssize_t (*unsent)(struct vsock_sock *vsk);
+ struct vsock_sock *vsk = vsock_sk(sk);
- /* Some transports (Hyper-V, VMCI) do not implement
- * unsent_bytes. For those, no lingering on close().
- */
- unsent = vsk->transport->unsent_bytes;
- if (!unsent)
- return;
+ if (!timeout)
+ return;
+
+ /* Some transports (Hyper-V, VMCI) do not implement unsent_bytes.
+ * For those, no lingering on close().
+ */
+ unsent = vsk->transport->unsent_bytes;
+ if (!unsent)
+ return;
- add_wait_queue(sk_sleep(sk), &wait);
+ add_wait_queue(sk_sleep(sk), &wait);
- do {
- if (sk_wait_event(sk, &timeout, unsent(vsk) == 0,
- &wait))
- break;
- } while (!signal_pending(current) && timeout);
+ do {
+ if (sk_wait_event(sk, &timeout, unsent(vsk) == 0, &wait))
+ break;
+ } while (!signal_pending(current) && timeout);
- remove_wait_queue(sk_sleep(sk), &wait);
- }
+ remove_wait_queue(sk_sleep(sk), &wait);
}
static void virtio_transport_cancel_close_work(struct vsock_sock *vsk,
--
2.49.0
