[PATCH v4 5/9] vsock/virtio: Rename virtio_vsock_alloc_skb()

[Will Deacon]

In preparation for nonlinear allocations for large SKBs, rename
virtio_vsock_alloc_skb() to virtio_vsock_alloc_linear_skb() to indicate
that it returns linear SKBs unconditionally and switch all callers over
to this new interface for now.

No functional change.

Reviewed-by: Stefano Garzarella <sgarz...@redhat.com>
Signed-off-by: Will Deacon <w...@kernel.org>
---
 drivers/vhost/vsock.c                   | 2 +-
 include/linux/virtio_vsock.h            | 3 ++-
 net/vmw_vsock/virtio_transport.c        | 2 +-
 net/vmw_vsock/virtio_transport_common.c | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c
index 4c4a642945eb..1ad96613680e 100644
--- a/drivers/vhost/vsock.c
+++ b/drivers/vhost/vsock.c
@@ -348,7 +348,7 @@ vhost_vsock_alloc_skb(struct vhost_virtqueue *vq,
                return NULL;
 
        /* len contains both payload and hdr */
-       skb = virtio_vsock_alloc_skb(len, GFP_KERNEL);
+       skb = virtio_vsock_alloc_linear_skb(len, GFP_KERNEL);
        if (!skb)
                return NULL;
 
diff --git a/include/linux/virtio_vsock.h b/include/linux/virtio_vsock.h
index 879f1dfa7d3a..4504ea29ff82 100644
--- a/include/linux/virtio_vsock.h
+++ b/include/linux/virtio_vsock.h
@@ -52,7 +52,8 @@ static inline void virtio_vsock_skb_rx_put(struct sk_buff 
*skb, u32 len)
        skb_put(skb, len);
 }
 
-static inline struct sk_buff *virtio_vsock_alloc_skb(unsigned int size, gfp_t 
mask)
+static inline struct sk_buff *
+virtio_vsock_alloc_linear_skb(unsigned int size, gfp_t mask)
 {
        struct sk_buff *skb;
 
diff --git a/net/vmw_vsock/virtio_transport.c b/net/vmw_vsock/virtio_transport.c
index 39f346890f7f..80dcf6ac1e72 100644
--- a/net/vmw_vsock/virtio_transport.c
+++ b/net/vmw_vsock/virtio_transport.c
@@ -316,7 +316,7 @@ static void virtio_vsock_rx_fill(struct virtio_vsock *vsock)
        vq = vsock->vqs[VSOCK_VQ_RX];
 
        do {
-               skb = virtio_vsock_alloc_skb(total_len, GFP_KERNEL);
+               skb = virtio_vsock_alloc_linear_skb(total_len, GFP_KERNEL);
                if (!skb)
                        break;
 
diff --git a/net/vmw_vsock/virtio_transport_common.c 
b/net/vmw_vsock/virtio_transport_common.c
index 1b5d9896edae..c9eb7f7ac00d 100644
--- a/net/vmw_vsock/virtio_transport_common.c
+++ b/net/vmw_vsock/virtio_transport_common.c
@@ -261,7 +261,7 @@ static struct sk_buff *virtio_transport_alloc_skb(struct 
virtio_vsock_pkt_info *
        if (!zcopy)
                skb_len += payload_len;
 
-       skb = virtio_vsock_alloc_skb(skb_len, GFP_KERNEL);
+       skb = virtio_vsock_alloc_linear_skb(skb_len, GFP_KERNEL);
        if (!skb)
                return NULL;
 
-- 
2.50.0.727.gbf7dc18ff4-goog