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

…/git/mst/vhost
git-mirror · Dec 12, 2010 · 36eac21 · 36eac21
2 parents a19faf0 + e4dde73
commit 36eac21
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
@@ -884,6 +884,7 @@ static int log_write(void __user *log_base,
 	int r;
 	if (!write_length)
 		return 0;
+	write_length += write_address % VHOST_PAGE_SIZE;
 	write_address /= VHOST_PAGE_SIZE;
 	for (;;) {
 		u64 base = (u64)(unsigned long)log_base;
@@ -897,7 +898,7 @@ static int log_write(void __user *log_base,
 		if (write_length <= VHOST_PAGE_SIZE)
 			break;
 		write_length -= VHOST_PAGE_SIZE;
-		write_address += VHOST_PAGE_SIZE;
+		write_address += 1;
 	}
 	return r;
 }