diff options
| author |   David S. Miller <davem@davemloft.net> | 2011-01-14 12:41:47 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-14 12:41:47 -0800 |
| commit | b7e2041e2a184e3221970eaacf56724369e56bd9 (patch) | |
| tree | 005c996c0f96951818d72e380c8c5fc716b48f07 /drivers | |
| parent | cassini: Fix build bustage on x86. (diff) | |
| parent | vhost: fix signed/unsigned comparison (diff) | |
| download | linux-dev-b7e2041e2a184e3221970eaacf56724369e56bd9.tar.xz linux-dev-b7e2041e2a184e3221970eaacf56724369e56bd9.zip | |
Merge branch 'vhost-net' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/vhost/vhost.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c index 38244f59cdd9..ade0568c07a4 100644 --- a/drivers/vhost/vhost.c +++ b/drivers/vhost/vhost.c @@ -97,22 +97,26 @@ void vhost_poll_stop(struct vhost_poll *poll) 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) { unsigned seq; - int left; int flushing; spin_lock_irq(&dev->work_lock); seq = work->queue_seq; work->flushing++; spin_unlock_irq(&dev->work_lock); - wait_event(work->done, ({ - spin_lock_irq(&dev->work_lock); - left = seq - work->done_seq <= 0; - spin_unlock_irq(&dev->work_lock); - left; - })); + wait_event(work->done, vhost_work_seq_done(dev, work, seq)); spin_lock_irq(&dev->work_lock); flushing = --work->flushing; spin_unlock_irq(&dev->work_lock); |