[Devel] [PATCH RHEL7 COMMIT] ms/vsock/vmci: remove unused VSOCK_DEFAULT_CONNECT_TIMEOUT

Vasily Averin vvs at virtuozzo.com
Wed Apr 21 17:51:48 MSK 2021


The commit is pushed to "branch-rh7-3.10.0-1160.21.1.vz7.174.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-1160.21.1.vz7.174.10
------>
commit de0317b9ac2e6428dcec89df057130ca3141ab2b
Author: Stefano Garzarella <sgarzare at redhat.com>
Date:   Wed Apr 21 17:51:48 2021 +0300

    ms/vsock/vmci: remove unused VSOCK_DEFAULT_CONNECT_TIMEOUT
    
    The VSOCK_DEFAULT_CONNECT_TIMEOUT definition was introduced with
    commit d021c344051af ("VSOCK: Introduce VM Sockets"), but it is
    never used in the net/vmw_vsock/vmci_transport.c.
    
    VSOCK_DEFAULT_CONNECT_TIMEOUT is used and defined in
    net/vmw_vsock/af_vsock.c
    
    Cc: Jorgen Hansen <jhansen at vmware.com>
    Reviewed-by: Stefan Hajnoczi <stefanha at redhat.com>
    Reviewed-by: Jorgen Hansen <jhansen at vmware.com>
    Signed-off-by: Stefano Garzarella <sgarzare at redhat.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>
    
    https://jira.sw.ru/browse/PSBM-128702
    (cherry picked from commit 7ed78bc495fda7c1e79b85c3ab0f240685afcc80)
    Signed-off-by: Konstantin Khorenko <khorenko at virtuozzo.com>
---
 net/vmw_vsock/vmci_transport.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/net/vmw_vsock/vmci_transport.c b/net/vmw_vsock/vmci_transport.c
index d470338..ec20a6f 100644
--- a/net/vmw_vsock/vmci_transport.c
+++ b/net/vmw_vsock/vmci_transport.c
@@ -87,11 +87,6 @@ static int PROTOCOL_OVERRIDE = -1;
 #define VMCI_TRANSPORT_DEFAULT_QP_SIZE       262144
 #define VMCI_TRANSPORT_DEFAULT_QP_SIZE_MAX   262144
 
-/* The default peer timeout indicates how long we will wait for a peer response
- * to a control message.
- */
-#define VSOCK_DEFAULT_CONNECT_TIMEOUT (2 * HZ)
-
 /* Helper function to convert from a VMCI error code to a VSock error code. */
 
 static s32 vmci_transport_error_to_vsock_error(s32 vmci_error)


More information about the Devel mailing list