leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vsock: move vsock_insert_unbound() in the vsock_create()

Browse Source 
vsock_insert_unbound() was called only when 'sock' parameter of
__vsock_create() was not null. This only happened when
__vsock_create() was called by vsock_create().

In order to simplify the multi-transports support, this patch
moves vsock_insert_unbound() at the end of vsock_create().

Reviewed-by: Dexuan Cui <decui@microsoft.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Jorgen Hansen <jhansen@vmware.com>
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Stefano Garzarella 2019-11-14 10:57:44 +01:00 committed by David S. Miller
parent b9ca2f5ff7
commit 55f3e149b6
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
net/vmw_vsock/af_vsock.c
View File

@ -634,9 +634,6 @@ static struct sock *__vsock_create(struct net *net,
return NULL; return NULL;
} }
if (sock)
vsock_insert_unbound(vsk);
return sk; return sk;
} }
@ -1887,6 +1884,8 @@ static const struct proto_ops vsock_stream_ops = {
static int vsock_create(struct net *net, struct socket *sock, static int vsock_create(struct net *net, struct socket *sock,
int protocol, int kern) int protocol, int kern)
{ {
struct sock *sk;
if (!sock) if (!sock)
return -EINVAL; return -EINVAL;
@ -1906,7 +1905,13 @@ static int vsock_create(struct net *net, struct socket *sock,
sock->state = SS_UNCONNECTED; sock->state = SS_UNCONNECTED;
return __vsock_create(net, sock, NULL, GFP_KERNEL, 0, kern) ? 0 : -ENOMEM; sk = __vsock_create(net, sock, NULL, GFP_KERNEL, 0, kern);
if (!sk)
return -ENOMEM;
vsock_insert_unbound(vsock_sk(sk));
return 0;
} }
static const struct net_proto_family vsock_family_ops = { static const struct net_proto_family vsock_family_ops = {