From: Stefano Garzarella <sgarzare@redhat.com>
To: netdev@vger.kernel.org
Cc: Stephen Hemminger <sthemmin@microsoft.com>,
Arnd Bergmann <arnd@arndb.de>, Jorgen Hansen <jhansen@vmware.com>,
Jason Wang <jasowang@redhat.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-kernel@vger.kernel.org,
"Michael S. Tsirkin" <mst@redhat.com>,
Haiyang Zhang <haiyangz@microsoft.com>,
Stefan Hajnoczi <stefanha@redhat.com>,
"David S. Miller" <davem@davemloft.net>,
virtualization@lists.linux-foundation.org, kvm@vger.kernel.org,
Sasha Levin <sashal@kernel.org>,
"K. Y. Srinivasan" <kys@microsoft.com>,
Dexuan Cui <decui@microsoft.com>,
linux-hyperv@vger.kernel.org
Subject: [PATCH net-next v2 02/15] vsock: remove vm_sockets_get_local_cid()
Date: Thu, 14 Nov 2019 10:57:37 +0100 [thread overview]
Message-ID: <20191114095750.59106-3-sgarzare@redhat.com> (raw)
In-Reply-To: <20191114095750.59106-1-sgarzare@redhat.com>
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 <stefanha@redhat.com>
Reviewed-by: Jorgen Hansen <jhansen@vmware.com>
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
---
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 <uapi/linux/vm_sockets.h>
-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 1f4fde4711b6..eb13693e9d04 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 828edd88488c..3edc373d2acc 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
next prev parent reply other threads:[~2019-11-14 9:58 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-14 9:57 [PATCH net-next v2 00/15] vsock: add multi-transports support Stefano Garzarella
2019-11-14 9:57 ` [PATCH net-next v2 01/15] vsock/vmci: remove unused VSOCK_DEFAULT_CONNECT_TIMEOUT Stefano Garzarella
2019-11-14 9:57 ` Stefano Garzarella [this message]
2019-11-14 9:57 ` [PATCH net-next v2 03/15] vsock: remove include/linux/vm_sockets.h file Stefano Garzarella
2019-11-14 9:57 ` [PATCH net-next v2 04/15] vsock: add 'transport' member in the struct vsock_sock Stefano Garzarella
2019-11-14 9:57 ` [PATCH net-next v2 05/15] vsock/virtio: add transport parameter to the virtio_transport_reset_no_sock() Stefano Garzarella
2019-11-14 9:57 ` [PATCH net-next v2 06/15] vsock: add 'struct vsock_sock *' param to vsock_core_get_transport() Stefano Garzarella
2019-11-14 9:57 ` [PATCH net-next v2 07/15] vsock: handle buffer_size sockopts in the core Stefano Garzarella
2019-11-14 9:57 ` [PATCH net-next v2 08/15] vsock: add vsock_create_connected() called by transports Stefano Garzarella
2019-11-14 9:57 ` [PATCH net-next v2 09/15] vsock: move vsock_insert_unbound() in the vsock_create() Stefano Garzarella
2019-11-14 9:57 ` [PATCH net-next v2 10/15] hv_sock: set VMADDR_CID_HOST in the hvs_remote_addr_init() Stefano Garzarella
2019-11-14 9:57 ` [PATCH net-next v2 11/15] vsock: add multi-transports support Stefano Garzarella
2019-11-14 9:57 ` [PATCH net-next v2 12/15] vsock/vmci: register vmci_transport only when VMCI guest/host are active Stefano Garzarella
2019-11-14 9:57 ` [PATCH net-next v2 13/15] vsock: prevent transport modules unloading Stefano Garzarella
2019-11-14 9:57 ` [PATCH net-next v2 14/15] vsock: fix bind() behaviour taking care of CID Stefano Garzarella
2019-11-14 9:57 ` [PATCH net-next v2 15/15] vhost/vsock: refuse CID assigned to the guest->host transport Stefano Garzarella
2019-11-15 2:12 ` [PATCH net-next v2 00/15] vsock: add multi-transports support David Miller
2019-11-15 8:26 ` Stefano Garzarella
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191114095750.59106-3-sgarzare@redhat.com \
--to=sgarzare@redhat.com \
--cc=arnd@arndb.de \
--cc=davem@davemloft.net \
--cc=decui@microsoft.com \
--cc=gregkh@linuxfoundation.org \
--cc=haiyangz@microsoft.com \
--cc=jasowang@redhat.com \
--cc=jhansen@vmware.com \
--cc=kvm@vger.kernel.org \
--cc=kys@microsoft.com \
--cc=linux-hyperv@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=sashal@kernel.org \
--cc=stefanha@redhat.com \
--cc=sthemmin@microsoft.com \
--cc=virtualization@lists.linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).