diff options
| author | Jorgen Hansen <jhansen@vmware.com> | 2015-10-22 08:25:25 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-10-22 18:26:29 -0700 |
| commit | 8566b86ab9f0f45bc6f7dd422b21de9d0cf5415a (patch) | |
| tree | c4d19803bf985dd55072cba23d567b75bb0e2f31 /net/vmw_vsock | |
| parent | 0db65fcfcded76fe4f74e3ca9f4e2baf67b683ef (diff) | |
| download | linux-stable-8566b86ab9f0f45bc6f7dd422b21de9d0cf5415a.tar.gz linux-stable-8566b86ab9f0f45bc6f7dd422b21de9d0cf5415a.tar.bz2 linux-stable-8566b86ab9f0f45bc6f7dd422b21de9d0cf5415a.zip | |
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/vmw_vsock')
| -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, vmci_trans(vsk)->notify_ops = NULL; INIT_LIST_HEAD(&vmci_trans(vsk)->elem); vmci_trans(vsk)->sk = &vsk->sk; - vmci_trans(vsk)->lock = __SPIN_LOCK_UNLOCKED(vmci_trans(vsk)->lock); + spin_lock_init(&vmci_trans(vsk)->lock); if (psk) { vmci_trans(vsk)->queue_pair_size = vmci_trans(psk)->queue_pair_size; |