---

yaml --- r: 225157 b: refs/heads/master c: 3bf9be4 h: refs/heads/master i: 225155: a1c5feb v: v3
git-mirror · Dec 9, 2010 · 316f6c6 · 316f6c6
1 parent 4ca4928
commit 316f6c6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a290aec88a9c4747353ea7aa9b2569bd61297c3c
+refs/heads/master: 3bf9be40ff76b6df136f14a497167c116b2b3c53
diff --git a/trunk/drivers/vhost/vhost.c b/trunk/drivers/vhost/vhost.c
@@ -885,6 +885,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;
@@ -898,7 +899,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;
 }