Merge branch 'vhost-net' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

824044c1 · David S. Miller · fb0c5f0b · 5786aee8 · 824044c1
Commit 824044c1 authored 14 years ago by David S. Miller
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

drivers/vhost/vhost.c drivers/vhost/vhost.c +4 -3

No files found.
--- 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;