Merge branch 'vhost-net' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
This commit is contained in:
commit
36eac2130c
1 changed files with 2 additions and 1 deletions
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue