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

vhost: fix signed/unsigned comparison

Browse Source 
To detect that a sequence number is done, we are doing math on unsigned
integers so the result is unsigned too. Not what was intended for the <=
comparison. The result is user stuck forever in flush call.
Convert to int to fix this.

Further, get rid of ({}) to make code clearer.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Michael S. Tsirkin 2011-01-10 10:03:20 +02:00
parent 0c21e3aaf6
commit 0174b0c30a
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/vhost/vhost.c
View File

@ -97,22 +97,26 @@ void vhost_poll_stop(struct vhost_poll *poll)
remove_wait_queue(poll->wqh, &poll->wait); remove_wait_queue(poll->wqh, &poll->wait);
} }
static bool vhost_work_seq_done(struct vhost_dev *dev, struct vhost_work *work,
unsigned seq)
{
int left;
spin_lock_irq(&dev->work_lock);
left = seq - work->done_seq;
spin_unlock_irq(&dev->work_lock);
return left <= 0;
}
static void vhost_work_flush(struct vhost_dev *dev, struct vhost_work *work) static void vhost_work_flush(struct vhost_dev *dev, struct vhost_work *work)
{ {
unsigned seq; unsigned seq;
int left;
int flushing; int flushing;
spin_lock_irq(&dev->work_lock); spin_lock_irq(&dev->work_lock);
seq = work->queue_seq; seq = work->queue_seq;
work->flushing++; work->flushing++;
spin_unlock_irq(&dev->work_lock); spin_unlock_irq(&dev->work_lock);
wait_event(work->done, ({ wait_event(work->done, vhost_work_seq_done(dev, work, seq));
spin_lock_irq(&dev->work_lock);
left = seq - work->done_seq <= 0;
spin_unlock_irq(&dev->work_lock);
left;
}));
spin_lock_irq(&dev->work_lock); spin_lock_irq(&dev->work_lock);
flushing = --work->flushing; flushing = --work->flushing;
spin_unlock_irq(&dev->work_lock); spin_unlock_irq(&dev->work_lock);