diff options
Diffstat (limited to 'drivers/vhost/net.c')
| -rw-r--r-- | drivers/vhost/net.c | 13 | 
1 files changed, 9 insertions, 4 deletions
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c index 57a593c58cf..d219070fed3 100644 --- a/drivers/vhost/net.c +++ b/drivers/vhost/net.c @@ -177,8 +177,8 @@ static void handle_tx(struct vhost_net *net)  			break;  		}  		if (err != len) -			pr_err("Truncated TX packet: " -			       " len %d != %zd\n", err, len); +			pr_debug("Truncated TX packet: " +				 " len %d != %zd\n", err, len);  		vhost_add_used_and_signal(&net->dev, vq, head, 0);  		total_len += len;  		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. */  		if (err > len) { -			pr_err("Discarded truncated rx packet: " -			       " len %d > %zd\n", err, len); +			pr_debug("Discarded truncated rx packet: " +				 " len %d > %zd\n", err, len);  			vhost_discard_vq_desc(vq);  			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);  	vhost_net_enable_vq(n, vq);  done: +	mutex_unlock(&vq->mutex); +  	if (oldsock) {  		vhost_net_flush_vq(n, index);  		fput(oldsock->file);  	} +	mutex_unlock(&n->dev.mutex); +	return 0; +  err_vq:  	mutex_unlock(&vq->mutex);  err:  |