From: Michal Luczaj <mhal@rbox.co>
To: "Stefano Garzarella" <sgarzare@redhat.com>,
"David S. Miller" <davem@davemloft.net>,
"Eric Dumazet" <edumazet@google.com>,
"Jakub Kicinski" <kuba@kernel.org>,
"Paolo Abeni" <pabeni@redhat.com>,
"Simon Horman" <horms@kernel.org>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Jason Wang" <jasowang@redhat.com>,
"Xuan Zhuo" <xuanzhuo@linux.alibaba.com>,
"Eugenio Pérez" <eperezma@redhat.com>,
"Stefan Hajnoczi" <stefanha@redhat.com>
Cc: virtualization@lists.linux.dev, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, kvm@vger.kernel.org,
Michal Luczaj <mhal@rbox.co>
Subject: [PATCH net-next v2 2/3] vsock: Reduce indentation in virtio_transport_wait_close()
Date: Mon, 21 Apr 2025 23:50:42 +0200 [thread overview]
Message-ID: <20250421-vsock-linger-v2-2-fe9febd64668@rbox.co> (raw)
In-Reply-To: <20250421-vsock-linger-v2-0-fe9febd64668@rbox.co>
Flatten the function. Remove the nested block by inverting the condition:
return early on !timeout.
No functional change intended.
Suggested-by: Stefano Garzarella <sgarzare@redhat.com>
Signed-off-by: Michal Luczaj <mhal@rbox.co>
---
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
next prev parent reply other threads:[~2025-04-21 21:51 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-21 21:50 [PATCH net-next v2 0/3] vsock: SOCK_LINGER rework Michal Luczaj
2025-04-21 21:50 ` [PATCH net-next v2 1/3] vsock: Linger on unsent data Michal Luczaj
2025-04-23 15:53 ` Luigi Leonardi
2025-04-23 16:34 ` Stefano Garzarella
2025-04-23 21:06 ` Michal Luczaj
2025-04-24 7:28 ` Stefano Garzarella
2025-04-24 7:52 ` Michal Luczaj
2025-04-24 8:36 ` Stefano Garzarella
2025-04-24 11:24 ` Michal Luczaj
2025-04-28 13:56 ` Stefano Garzarella
2025-04-30 9:13 ` Michal Luczaj
2025-04-21 21:50 ` Michal Luczaj [this message]
2025-04-21 21:50 ` [PATCH net-next v2 3/3] vsock/test: Expand linger test to ensure close() does not misbehave Michal Luczaj
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250421-vsock-linger-v2-2-fe9febd64668@rbox.co \
--to=mhal@rbox.co \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=eperezma@redhat.com \
--cc=horms@kernel.org \
--cc=jasowang@redhat.com \
--cc=kuba@kernel.org \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=sgarzare@redhat.com \
--cc=stefanha@redhat.com \
--cc=virtualization@lists.linux.dev \
--cc=xuanzhuo@linux.alibaba.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®