Commit d80dc15b authored by Xuan Zhuo's avatar Xuan Zhuo Committed by Michael S. Tsirkin
Browse files

virtio_ring: rename vring_unmap_state_packed() to vring_unmap_extra_packed() 



The actual parameter handled by vring_unmap_state_packed() is that
vring_desc_extra, so this function should use "extra" instead of "state".

Signed-off-by: default avatarXuan Zhuo <xuanzhuo@linux.alibaba.com>
Link: https://lore.kernel.org/r/20220224110402.108161-2-xuanzhuo@linux.alibaba.com


Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 1e00e821

drivers/virtio/virtio_ring.c

+8 −9
Original line number Diff line number Diff line
@@ -984,24 +984,24 @@ static struct virtqueue *vring_create_virtqueue_split( 
 * Packed ring specific functions - *_packed().

 */



static void vring_unmap_state_packed(const struct vring_virtqueue *vq,

				     struct vring_desc_extra *state)

static void vring_unmap_extra_packed(const struct vring_virtqueue *vq,

				     struct vring_desc_extra *extra)

{

	u16 flags;



	if (!vq->use_dma_api)

		return;



	flags = state->flags;

	flags = extra->flags;



	if (flags & VRING_DESC_F_INDIRECT) {

		dma_unmap_single(vring_dma_dev(vq),

				 state->addr, state->len,

				 extra->addr, extra->len,

				 (flags & VRING_DESC_F_WRITE) ?

				 DMA_FROM_DEVICE : DMA_TO_DEVICE);

	} else {

		dma_unmap_page(vring_dma_dev(vq),

			       state->addr, state->len,

			       extra->addr, extra->len,

			       (flags & VRING_DESC_F_WRITE) ?

			       DMA_FROM_DEVICE : DMA_TO_DEVICE);

	}
@@ -1303,8 +1303,7 @@ static inline int virtqueue_add_packed(struct virtqueue *_vq, 
	for (n = 0; n < total_sg; n++) {

		if (i == err_idx)

			break;

		vring_unmap_state_packed(vq,

					 &vq->packed.desc_extra[curr]);

		vring_unmap_extra_packed(vq, &vq->packed.desc_extra[curr]);

		curr = vq->packed.desc_extra[curr].next;

		i++;

		if (i >= vq->packed.vring.num)
@@ -1383,7 +1382,7 @@ static void detach_buf_packed(struct vring_virtqueue *vq, 
	if (unlikely(vq->use_dma_api)) {

		curr = id;

		for (i = 0; i < state->num; i++) {

			vring_unmap_state_packed(vq,

			vring_unmap_extra_packed(vq,

						 &vq->packed.desc_extra[curr]);

			curr = vq->packed.desc_extra[curr].next;

		}