diff mbox series

[azure,4.13,10/19] Revert "UBUNTU: SAUCE: hvsock: fix vsock_dequeue/enqueue_accept race"

Message ID 1513093328-10999-11-git-send-email-marcelo.cerri@canonical.com
State New
Headers show
Series None | expand

Commit Message

Marcelo Henrique Cerri Dec. 12, 2017, 3:41 p.m. UTC 
From: Dexuan Cui <decui@microsoft.com>

BugLink: http://bugs.launchpad.net/bugs/1736283

This reverts commit 584a433f9c88ec93f6e5cae458f4163c694b01f9.

Signed-off-by: Dexuan Cui <decui@microsoft.com>
Signed-off-by: Marcelo Henrique Cerri <marcelo.cerri@canonical.com>
---
 net/vmw_vsock/af_vsock.c | 7 -------
 1 file changed, 7 deletions(-)
diff mbox series

Patch

diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
index b7b2c66d91fd..dfc8c51e4d74 100644
--- a/net/vmw_vsock/af_vsock.c
+++ b/net/vmw_vsock/af_vsock.c
@@ -126,7 +126,6 @@  static struct proto vsock_proto = {
 
 static const struct vsock_transport *transport;
 static DEFINE_MUTEX(vsock_register_mutex);
-static DEFINE_SPINLOCK(vsock_accept_queue_lock);
 
 /**** EXPORTS ****/
 
@@ -407,10 +406,7 @@  void vsock_enqueue_accept(struct sock *listener, struct sock *connected)
 
 	sock_hold(connected);
 	sock_hold(listener);
-
-	spin_lock(&vsock_accept_queue_lock);
 	list_add_tail(&vconnected->accept_queue, &vlistener->accept_queue);
-	spin_unlock(&vsock_accept_queue_lock);
 }
 EXPORT_SYMBOL_GPL(vsock_enqueue_accept);
 
@@ -427,10 +423,7 @@  static struct sock *vsock_dequeue_accept(struct sock *listener)
 	vconnected = list_entry(vlistener->accept_queue.next,
 				struct vsock_sock, accept_queue);
 
-	spin_lock(&vsock_accept_queue_lock);
 	list_del_init(&vconnected->accept_queue);
-	spin_unlock(&vsock_accept_queue_lock);
-
 	sock_put(listener);
 	/* The caller will need a reference on the connected socket so we let
 	 * it call sock_put().