leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

virtio_ring: rename vring_unmap_state_packed() to vring_unmap_extra_packed()

Browse Source 
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: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
Link: https://lore.kernel.org/r/20220224110402.108161-2-xuanzhuo@linux.alibaba.com
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Xuan Zhuo 2022-02-24 19:03:54 +08:00 committed by Michael S. Tsirkin
parent 1e00e821e4
commit d80dc15bb6
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/virtio/virtio_ring.c
View File

@ -984,24 +984,24 @@ static struct virtqueue *vring_create_virtqueue_split(
* Packed ring specific functions - *_packed(). * Packed ring specific functions - *_packed().
*/ */
static void vring_unmap_state_packed(const struct vring_virtqueue *vq, static void vring_unmap_extra_packed(const struct vring_virtqueue *vq,
struct vring_desc_extra *state) struct vring_desc_extra *extra)
{ {
u16 flags; u16 flags;
if (!vq->use_dma_api) if (!vq->use_dma_api)
return; return;
flags = state->flags; flags = extra->flags;
if (flags & VRING_DESC_F_INDIRECT) { if (flags & VRING_DESC_F_INDIRECT) {
dma_unmap_single(vring_dma_dev(vq), dma_unmap_single(vring_dma_dev(vq),
state->addr, state->len, extra->addr, extra->len,
(flags & VRING_DESC_F_WRITE) ? (flags & VRING_DESC_F_WRITE) ?
DMA_FROM_DEVICE : DMA_TO_DEVICE); DMA_FROM_DEVICE : DMA_TO_DEVICE);
} else { } else {
dma_unmap_page(vring_dma_dev(vq), dma_unmap_page(vring_dma_dev(vq),
state->addr, state->len, extra->addr, extra->len,
(flags & VRING_DESC_F_WRITE) ? (flags & VRING_DESC_F_WRITE) ?
DMA_FROM_DEVICE : DMA_TO_DEVICE); DMA_FROM_DEVICE : DMA_TO_DEVICE);
} }
@ -1303,8 +1303,7 @@ unmap_release:
for (n = 0; n < total_sg; n++) { for (n = 0; n < total_sg; n++) {
if (i == err_idx) if (i == err_idx)
break; break;
vring_unmap_state_packed(vq, vring_unmap_extra_packed(vq, &vq->packed.desc_extra[curr]);
&vq->packed.desc_extra[curr]);
curr = vq->packed.desc_extra[curr].next; curr = vq->packed.desc_extra[curr].next;
i++; i++;
if (i >= vq->packed.vring.num) if (i >= vq->packed.vring.num)
@ -1383,8 +1382,8 @@ static void detach_buf_packed(struct vring_virtqueue *vq,
if (unlikely(vq->use_dma_api)) { if (unlikely(vq->use_dma_api)) {
curr = id; curr = id;
for (i = 0; i < state->num; i++) { for (i = 0; i < state->num; i++) {
vring_unmap_state_packed(vq, vring_unmap_extra_packed(vq,
&vq->packed.desc_extra[curr]); &vq->packed.desc_extra[curr]);
curr = vq->packed.desc_extra[curr].next; curr = vq->packed.desc_extra[curr].next;
} }
} }