Skip to content

Commit

Permalink
virtio: make virtqueue_add_buf() returning 0 on success, not capacity.
Browse files Browse the repository at this point in the history
Now noone relies on this behavior, we simplify virtqueue_add_buf() so it
return 0 or -errno.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
  • Loading branch information
Rusty Russell committed Dec 18, 2012
1 parent 49e86f1 commit 98e8c6b
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions drivers/virtio/virtio_ring.c
Original file line number Diff line number Diff line change
Expand Up @@ -188,10 +188,7 @@ static int vring_add_indirect(struct vring_virtqueue *vq,
* Caller must ensure we don't call this with other virtqueue operations
* at the same time (except where noted).
*
* Returns remaining capacity of queue or a negative error
* (ie. ENOSPC). Note that it only really makes sense to treat all
* positive return values as "available": indirect buffers mean that
* we can put an entire sg[] array inside a single queue entry.
* Returns zero or a negative error (ie. ENOSPC, ENOMEM).
*/
int virtqueue_add_buf(struct virtqueue *_vq,
struct scatterlist sg[],
Expand Down Expand Up @@ -291,7 +288,7 @@ int virtqueue_add_buf(struct virtqueue *_vq,
pr_debug("Added buffer head %i to %p\n", head, vq);
END_USE(vq);

return vq->vq.num_free;
return 0;
}
EXPORT_SYMBOL_GPL(virtqueue_add_buf);

Expand Down

0 comments on commit 98e8c6b

Please sign in to comment.