Skip to content

Commit

Permalink
Merge branch 'vhost-net-next' of git://git.kernel.org/pub/scm/linux/k…
Browse files Browse the repository at this point in the history
…ernel/git/mst/vhost
davem330 committed Jun 2, 2010
2 parents ab95bfe + f8322fb commit 0dea7c1
Showing 2 changed files with 8 additions and 9 deletions.
13 changes: 6 additions & 7 deletions drivers/vhost/net.c
Original file line number Diff line number Diff line change
@@ -519,13 +519,12 @@ static long vhost_net_set_backend(struct vhost_net *n, unsigned index, int fd)

/* start polling new socket */
oldsock = vq->private_data;
if (sock == oldsock)
goto done;
if (sock != oldsock){
vhost_net_disable_vq(n, vq);
rcu_assign_pointer(vq->private_data, sock);
vhost_net_enable_vq(n, vq);
}

vhost_net_disable_vq(n, vq);
rcu_assign_pointer(vq->private_data, sock);
vhost_net_enable_vq(n, vq);
done:
if (oldsock) {
vhost_net_flush_vq(n, index);
fput(oldsock->file);
@@ -626,7 +625,7 @@ static long vhost_net_compat_ioctl(struct file *f, unsigned int ioctl,
}
#endif

const static struct file_operations vhost_net_fops = {
static const struct file_operations vhost_net_fops = {
.owner = THIS_MODULE,
.release = vhost_net_release,
.unlocked_ioctl = vhost_net_ioctl,
4 changes: 2 additions & 2 deletions drivers/vhost/vhost.c
Original file line number Diff line number Diff line change
@@ -237,8 +237,8 @@ static int vq_memory_access_ok(void __user *log_base, struct vhost_memory *mem,
{
int i;

if (!mem)
return 0;
if (!mem)
return 0;

for (i = 0; i < mem->nregions; ++i) {
struct vhost_memory_region *m = mem->regions + i;

0 comments on commit 0dea7c1

Please sign in to comment.