diff options
author | Rusty Russell <rusty@rustcorp.com.au> | 2012-10-16 09:26:15 -0400 |
---|---|---|
committer | Rusty Russell <rusty@rustcorp.com.au> | 2012-12-17 23:50:34 -0500 |
commit | 98e8c6bc66048db6f921ccd5b24f0e09804cfcca (patch) | |
tree | 42ba3a2f6e3ce22741c6a970ca99b7beab0ffbbb | |
parent | 49e86f16866fbf8e3c9a6b0770eb6f3c167f4b72 (diff) |
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>
-rw-r--r-- | drivers/virtio/virtio_ring.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c index 33a4ce009bcc..ffd7e7da5d3b 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, | |||
188 | * Caller must ensure we don't call this with other virtqueue operations | 188 | * Caller must ensure we don't call this with other virtqueue operations |
189 | * at the same time (except where noted). | 189 | * at the same time (except where noted). |
190 | * | 190 | * |
191 | * Returns remaining capacity of queue or a negative error | 191 | * Returns zero or a negative error (ie. ENOSPC, ENOMEM). |
192 | * (ie. ENOSPC). Note that it only really makes sense to treat all | ||
193 | * positive return values as "available": indirect buffers mean that | ||
194 | * we can put an entire sg[] array inside a single queue entry. | ||
195 | */ | 192 | */ |
196 | int virtqueue_add_buf(struct virtqueue *_vq, | 193 | int virtqueue_add_buf(struct virtqueue *_vq, |
197 | struct scatterlist sg[], | 194 | struct scatterlist sg[], |
@@ -291,7 +288,7 @@ add_head: | |||
291 | pr_debug("Added buffer head %i to %p\n", head, vq); | 288 | pr_debug("Added buffer head %i to %p\n", head, vq); |
292 | END_USE(vq); | 289 | END_USE(vq); |
293 | 290 | ||
294 | return vq->vq.num_free; | 291 | return 0; |
295 | } | 292 | } |
296 | EXPORT_SYMBOL_GPL(virtqueue_add_buf); | 293 | EXPORT_SYMBOL_GPL(virtqueue_add_buf); |
297 | 294 | ||