From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jorgen Hansen via Virtualization Subject: RE: [PATCH net-next 02/14] vsock: remove vm_sockets_get_local_cid() Date: Wed, 30 Oct 2019 14:55:49 +0000 Message-ID: References: <20191023095554.11340-1-sgarzare@redhat.com> <20191023095554.11340-3-sgarzare@redhat.com> Reply-To: Jorgen Hansen Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20191023095554.11340-3-sgarzare@redhat.com> Content-Language: en-US List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: virtualization-bounces@lists.linux-foundation.org Errors-To: virtualization-bounces@lists.linux-foundation.org To: 'Stefano Garzarella' Cc: Sasha Levin , "linux-hyperv@vger.kernel.org" , Stephen Hemminger , Arnd Bergmann , "kvm@vger.kernel.org" , "Michael S. Tsirkin" , Greg Kroah-Hartman , Dexuan Cui , "linux-kernel@vger.kernel.org" , "virtualization@lists.linux-foundation.org" , Haiyang Zhang , Stefan Hajnoczi , "netdev@vger.kernel.org" , "David S. Miller" List-Id: virtualization@lists.linuxfoundation.org > -----Original Message----- > From: Stefano Garzarella [mailto:sgarzare@redhat.com] > Sent: Wednesday, October 23, 2019 11:56 AM > To: netdev@vger.kernel.org > Subject: [PATCH net-next 02/14] vsock: remove vm_sockets_get_local_cid() > > vm_sockets_get_local_cid() is only used in virtio_transport_common.c. > We can replace it calling the virtio_transport_get_ops() and using the > get_local_cid() callback registered by the transport. > > Reviewed-by: Stefan Hajnoczi > Signed-off-by: Stefano Garzarella > --- > include/linux/vm_sockets.h | 2 -- > net/vmw_vsock/af_vsock.c | 10 ---------- > net/vmw_vsock/virtio_transport_common.c | 2 +- > 3 files changed, 1 insertion(+), 13 deletions(-) > > diff --git a/include/linux/vm_sockets.h b/include/linux/vm_sockets.h index > 33f1a2ecd905..7dd899ccb920 100644 > --- a/include/linux/vm_sockets.h > +++ b/include/linux/vm_sockets.h > @@ -10,6 +10,4 @@ > > #include > > -int vm_sockets_get_local_cid(void); > - > #endif /* _VM_SOCKETS_H */ > diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c index > 2ab43b2bba31..2f2582fb7fdd 100644 > --- a/net/vmw_vsock/af_vsock.c > +++ b/net/vmw_vsock/af_vsock.c > @@ -129,16 +129,6 @@ static struct proto vsock_proto = { static const struct > vsock_transport *transport; static DEFINE_MUTEX(vsock_register_mutex); > > -/**** EXPORTS ****/ > - > -/* Get the ID of the local context. This is transport dependent. */ > - > -int vm_sockets_get_local_cid(void) > -{ > - return transport->get_local_cid(); > -} > -EXPORT_SYMBOL_GPL(vm_sockets_get_local_cid); > - > /**** UTILS ****/ > > /* Each bound VSocket is stored in the bind hash table and each connected > diff --git a/net/vmw_vsock/virtio_transport_common.c > b/net/vmw_vsock/virtio_transport_common.c > index d02c9b41a768..b1cd16ed66ea 100644 > --- a/net/vmw_vsock/virtio_transport_common.c > +++ b/net/vmw_vsock/virtio_transport_common.c > @@ -168,7 +168,7 @@ static int virtio_transport_send_pkt_info(struct > vsock_sock *vsk, > struct virtio_vsock_pkt *pkt; > u32 pkt_len = info->pkt_len; > > - src_cid = vm_sockets_get_local_cid(); > + src_cid = virtio_transport_get_ops()->transport.get_local_cid(); > src_port = vsk->local_addr.svm_port; > if (!info->remote_cid) { > dst_cid = vsk->remote_addr.svm_cid; > -- > 2.21.0 Reviewed-by: Jorgen Hansen