From nobody Wed Dec 17 06:01:12 2025 Received: from mailtransmit05.runbox.com (mailtransmit05.runbox.com [185.226.149.38]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A72982165E9; Mon, 21 Apr 2025 21:51:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.226.149.38 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745272286; cv=none; b=OFLFpZ9xF5YvCU6GLle7bJzvq7zHSuVt/MtsBPvC53HHjghIL09tP2cRUrFdSdo/n4G5rwr0AmHCpQsxhgvUvjyWmh0wCz/OSG+fq/TzuaIScY/0k80j6zuOysV7z/XwDNtx4SajjG1bFQPbMCAKDAr5JottFD/5j9avvtx9EQw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745272286; c=relaxed/simple; bh=bHwtlyMxeHnsuncWmgegHfpg8gQ1s1DmHKYAxY8sXgk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=XaJBapN/DZ/V1cAAKTZDpNZr6iuvSRCCA428COkYdUc5r909hr0DL9nD3qRVDzWv6Zh+9b5xuZxAmcv0fP6I5sljC9jGVbaH7HDJ+u+KITfivQ9ui92VnBaoOuL1e1sr4wH0Ot3sAmrQ84ZbJU1k4o9gNDBnFC/tXnkf8zDlHzk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=rbox.co; spf=pass smtp.mailfrom=rbox.co; dkim=pass (2048-bit key) header.d=rbox.co header.i=@rbox.co header.b=O5hg71pU; arc=none smtp.client-ip=185.226.149.38 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=rbox.co Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rbox.co Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rbox.co header.i=@rbox.co header.b="O5hg71pU" Received: from mailtransmit02.runbox ([10.9.9.162] helo=aibo.runbox.com) by mailtransmit05.runbox.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1u6z2o-001iAs-H4; Mon, 21 Apr 2025 23:51:14 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=rbox.co; s=selector1; h=Cc:To:In-Reply-To:References:Message-Id: Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date:From; bh=497SM9RsTvdwm5GlckzJy9eHMN+5FbxFzHDjGrgCfG0=; b=O5hg71pUdZHmXxa1Y9QOpsyloh Z8857BgHLvnJZ+g5bi0rqGZBzECQDJfDKgKPA/Pwgt7mvzSl7ZPWq3V96byIFeD3ZSuN23junglVa JXB/dotkuq/XzSErNQyCmZ0vOjyvwzBr8SFGRAnf/+yzmjdltyt2Qg0ZAlbreJqzWlZaYAWKQOvtk dcYZA0yw9aeesVfx2wbXK2zy1W177weBBSWpUoxuskFllEd94Y8KiPTBTStjVbfcvu86BBjQEIWNv GVo6n6zEqN3ieS+qgJtdRdhVE0IqyF01c0uDp8X/b+jWuAxrffn+1YsUDC2OH8CtRh20+Z2YxOBqR wnTXRS+g==; Received: from [10.9.9.73] (helo=submission02.runbox) by mailtransmit02.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1u6z2o-0008Iu-4s; Mon, 21 Apr 2025 23:51:14 +0200 Received: by submission02.runbox with esmtpsa [Authenticated ID (604044)] (TLS1.2:ECDHE_SECP256R1__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.93) id 1u6z2i-0056xd-9L; Mon, 21 Apr 2025 23:51:08 +0200 From: Michal Luczaj Date: Mon, 21 Apr 2025 23:50:42 +0200 Subject: [PATCH net-next v2 2/3] vsock: Reduce indentation in virtio_transport_wait_close() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250421-vsock-linger-v2-2-fe9febd64668@rbox.co> References: <20250421-vsock-linger-v2-0-fe9febd64668@rbox.co> In-Reply-To: <20250421-vsock-linger-v2-0-fe9febd64668@rbox.co> To: Stefano Garzarella , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , =?utf-8?q?Eugenio_P=C3=A9rez?= , Stefan Hajnoczi Cc: virtualization@lists.linux.dev, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, Michal Luczaj X-Mailer: b4 0.14.2 Flatten the function. Remove the nested block by inverting the condition: return early on !timeout. No functional change intended. Suggested-by: Stefano Garzarella Signed-off-by: Michal Luczaj --- 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..73b6e7b437d950fd1cd1507f7dc= c28780bd98a0b 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 vso= ck_sock *vsk) =20 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 =3D vsock_sk(sk); + DEFINE_WAIT_FUNC(wait, woken_wake_function); + ssize_t (*unsent)(struct vsock_sock *vsk); + struct vsock_sock *vsk =3D vsock_sk(sk); =20 - /* Some transports (Hyper-V, VMCI) do not implement - * unsent_bytes. For those, no lingering on close(). - */ - unsent =3D 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 =3D vsk->transport->unsent_bytes; + if (!unsent) + return; =20 - add_wait_queue(sk_sleep(sk), &wait); + add_wait_queue(sk_sleep(sk), &wait); =20 - do { - if (sk_wait_event(sk, &timeout, unsent(vsk) =3D=3D 0, - &wait)) - break; - } while (!signal_pending(current) && timeout); + do { + if (sk_wait_event(sk, &timeout, unsent(vsk) =3D=3D 0, &wait)) + break; + } while (!signal_pending(current) && timeout); =20 - remove_wait_queue(sk_sleep(sk), &wait); - } + remove_wait_queue(sk_sleep(sk), &wait); } =20 static void virtio_transport_cancel_close_work(struct vsock_sock *vsk, --=20 2.49.0