Commit bf359b81 authored by Stefan Hajnoczi's avatar Stefan Hajnoczi Committed by David S. Miller
Browse files

VSOCK: move __vsock_in_bound/connected_table() to af_vsock.h 



The vsock_diag.ko module will need to check socket table membership.

Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 44f20980

include/net/af_vsock.h

+12 −0
Original line number Diff line number Diff line
@@ -180,6 +180,18 @@ const struct vsock_transport *vsock_core_get_transport(void); 


/**** UTILS ****/



/* vsock_table_lock must be held */

static inline bool __vsock_in_bound_table(struct vsock_sock *vsk)

{

	return !list_empty(&vsk->bound_table);

}



/* vsock_table_lock must be held */

static inline bool __vsock_in_connected_table(struct vsock_sock *vsk)

{

	return !list_empty(&vsk->connected_table);

}



void vsock_release_pending(struct sock *pending);

void vsock_add_pending(struct sock *listener, struct sock *pending);

void vsock_remove_pending(struct sock *listener, struct sock *pending);

net/vmw_vsock/af_vsock.c

+0 −10
Original line number Diff line number Diff line
@@ -250,16 +250,6 @@ static struct sock *__vsock_find_connected_socket(struct sockaddr_vm *src, 
	return NULL;

}



static bool __vsock_in_bound_table(struct vsock_sock *vsk)

{

	return !list_empty(&vsk->bound_table);

}



static bool __vsock_in_connected_table(struct vsock_sock *vsk)

{

	return !list_empty(&vsk->connected_table);

}



static void vsock_insert_unbound(struct vsock_sock *vsk)

{

	spin_lock_bh(&vsock_table_lock);