aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/virtio
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2012-10-16 23:56:15 +1030
committerRusty Russell <rusty@rustcorp.com.au>2012-12-18 15:20:34 +1030
commit98e8c6bc66048db6f921ccd5b24f0e09804cfcca (patch)
tree42ba3a2f6e3ce22741c6a970ca99b7beab0ffbbb /drivers/virtio
parent49e86f16866fbf8e3c9a6b0770eb6f3c167f4b72 (diff)
downloadkernel_goldelico_gta04-98e8c6bc66048db6f921ccd5b24f0e09804cfcca.zip
kernel_goldelico_gta04-98e8c6bc66048db6f921ccd5b24f0e09804cfcca.tar.gz
kernel_goldelico_gta04-98e8c6bc66048db6f921ccd5b24f0e09804cfcca.tar.bz2
virtio: make virtqueue_add_buf() returning 0 on success, not capacity.
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>
Diffstat (limited to 'drivers/virtio')
-rw-r--r--drivers/virtio/virtio_ring.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
index 33a4ce0..ffd7e7d 100644
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -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[],
@@ -291,7 +288,7 @@ add_head:
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);