summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-09-28 00:04:23 +0200
committerDavid S. Miller <davem@davemloft.net>2010-09-28 00:04:23 +0200
commit824044c19552e8a5f345781ccd1c2062673a41ad (patch)
tree1ab93ca25dec188c69151b51cdd3164612e3394a
parenttproxy: check for transparent flag in ip_route_newports (diff)
parentvhost: fix log ctx signalling (diff)
downloadlinux-824044c19552e8a5f345781ccd1c2062673a41ad.tar.xz
linux-824044c19552e8a5f345781ccd1c2062673a41ad.zip
Merge branch 'vhost-net' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
-rw-r--r--drivers/vhost/vhost.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
index c579dcc9200c..dd3d6f7406f8 100644
--- a/drivers/vhost/vhost.c
+++ b/drivers/vhost/vhost.c
@@ -858,11 +858,12 @@ int vhost_log_write(struct vhost_virtqueue *vq, struct vhost_log *log,
if (r < 0)
return r;
len -= l;
- if (!len)
+ if (!len) {
+ if (vq->log_ctx)
+ eventfd_signal(vq->log_ctx, 1);
return 0;
+ }
}
- if (vq->log_ctx)
- eventfd_signal(vq->log_ctx, 1);
/* Length written exceeds what we have stored. This is a bug. */
BUG();
return 0;