diff options
author | Jorgen Hansen <jhansen@vmware.com> | 2015-10-22 11:25:25 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-10-22 21:26:29 -0400 |
commit | 8566b86ab9f0f45bc6f7dd422b21de9d0cf5415a (patch) | |
tree | c4d19803bf985dd55072cba23d567b75bb0e2f31 /net | |
parent | 0db65fcfcded76fe4f74e3ca9f4e2baf67b683ef (diff) |
VSOCK: Fix lockdep issue.
The recent fix for the vsock sock_put issue used the wrong
initializer for the transport spin_lock causing an issue when
running with lockdep checking.
Testing: Verified fix on kernel with lockdep enabled.
Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Jorgen Hansen <jhansen@vmware.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/vmw_vsock/vmci_transport.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/vmw_vsock/vmci_transport.c b/net/vmw_vsock/vmci_transport.c index 5243ce2b2c18..7555cad83a75 100644 --- a/net/vmw_vsock/vmci_transport.c +++ b/net/vmw_vsock/vmci_transport.c | |||
@@ -1570,7 +1570,7 @@ static int vmci_transport_socket_init(struct vsock_sock *vsk, | |||
1570 | vmci_trans(vsk)->notify_ops = NULL; | 1570 | vmci_trans(vsk)->notify_ops = NULL; |
1571 | INIT_LIST_HEAD(&vmci_trans(vsk)->elem); | 1571 | INIT_LIST_HEAD(&vmci_trans(vsk)->elem); |
1572 | vmci_trans(vsk)->sk = &vsk->sk; | 1572 | vmci_trans(vsk)->sk = &vsk->sk; |
1573 | vmci_trans(vsk)->lock = __SPIN_LOCK_UNLOCKED(vmci_trans(vsk)->lock); | 1573 | spin_lock_init(&vmci_trans(vsk)->lock); |
1574 | if (psk) { | 1574 | if (psk) { |
1575 | vmci_trans(vsk)->queue_pair_size = | 1575 | vmci_trans(vsk)->queue_pair_size = |
1576 | vmci_trans(psk)->queue_pair_size; | 1576 | vmci_trans(psk)->queue_pair_size; |