vsock: move vsock_insert_unbound() in the vsock_create() (55f3e149) · Commits · 戴 / test

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>

net/vmw_vsock/af_vsock.c

+9 −4

Original line number	Diff line number	Diff line
		@@ -634,9 +634,6 @@ static struct sock __vsock_create(struct net net,
		return NULL;
		}

		if (sock)
		vsock_insert_unbound(vsk);

		return sk;
		}

		@@ -1887,6 +1884,8 @@ static const struct proto_ops vsock_stream_ops = {
		static int vsock_create(struct net net, struct socket sock,
		int protocol, int kern)
		{
		struct sock *sk;

		if (!sock)
		return -EINVAL;

		@@ -1906,7 +1905,13 @@ static int vsock_create(struct net net, struct socket sock,

		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 = {

Admin message