openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
David S. Miller 2010-07-16 12:41:44 -07:00
parent e40dbc51fb 95c0ec6a97
commit 0f6142fa96
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/vhost/net.c
View File

@ -177,8 +177,8 @@ static void handle_tx(struct vhost_net *net)
break; break;
} }
if (err != len) if (err != len)
pr_err("Truncated TX packet: " pr_debug("Truncated TX packet: "
" len %d != %zd\n", err, len); " len %d != %zd\n", err, len);
vhost_add_used_and_signal(&net->dev, vq, head, 0); vhost_add_used_and_signal(&net->dev, vq, head, 0);
total_len += len; total_len += len;
if (unlikely(total_len >= VHOST_NET_WEIGHT)) { if (unlikely(total_len >= VHOST_NET_WEIGHT)) {
@ -275,8 +275,8 @@ static void handle_rx(struct vhost_net *net)
} }
/* TODO: Should check and handle checksum. */ /* TODO: Should check and handle checksum. */
if (err > len) { if (err > len) {
pr_err("Discarded truncated rx packet: " pr_debug("Discarded truncated rx packet: "
" len %d > %zd\n", err, len); " len %d > %zd\n", err, len);
vhost_discard_vq_desc(vq); vhost_discard_vq_desc(vq);
continue; continue;
} }
@ -534,11 +534,16 @@ static long vhost_net_set_backend(struct vhost_net *n, unsigned index, int fd)
rcu_assign_pointer(vq->private_data, sock); rcu_assign_pointer(vq->private_data, sock);
vhost_net_enable_vq(n, vq); vhost_net_enable_vq(n, vq);
done: done:
mutex_unlock(&vq->mutex);
if (oldsock) { if (oldsock) {
vhost_net_flush_vq(n, index); vhost_net_flush_vq(n, index);
fput(oldsock->file); fput(oldsock->file);
} }
mutex_unlock(&n->dev.mutex);
return 0;
err_vq: err_vq:
mutex_unlock(&vq->mutex); mutex_unlock(&vq->mutex);
err: err: