vhost: logging thinko fix

[net-next-2.6.git] / drivers / vhost / vhost.c

diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
index 6eb15259f5ae8ad9f6d2ee614b9a945c657e510b..db21518f7e8d4a66a5d22cb59c4c217352df2a58 100644 (file)
--- a/drivers/vhost/vhost.c
+++ b/drivers/vhost/vhost.c
@@ -1004,10 +1004,14 @@ int vhost_add_used(struct vhost_virtqueue *vq, unsigned int head, int len)
        if (unlikely(vq->log_used)) {
                /* Make sure data is seen before log. */
                smp_wmb();
-               log_write(vq->log_base, vq->log_addr + sizeof *vq->used->ring *
-                         (vq->last_used_idx % vq->num),
-                         sizeof *vq->used->ring);
-               log_write(vq->log_base, vq->log_addr, sizeof *vq->used->ring);
+               /* Log used ring entry write. */
+               log_write(vq->log_base,
+                         vq->log_addr + ((void *)used - (void *)vq->used),
+                         sizeof *used);
+               /* Log used index update. */
+               log_write(vq->log_base,
+                         vq->log_addr + offsetof(struct vring_used, idx),
+                         sizeof vq->used->idx);
                if (vq->log_ctx)
                        eventfd_signal(vq->log_ctx, 1);
        }