Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af984413 authored by David S. Miller's avatar David S. Miller
Browse files

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

parents 37b7ef72 535297a6

drivers/vhost/net.c

+6 −4
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ static void handle_tx(struct vhost_net *net) 
	mutex_lock(&vq->mutex);

	vhost_disable_notify(vq);



	if (wmem < sock->sk->sk_sndbuf * 2)

	if (wmem < sock->sk->sk_sndbuf / 2)

		tx_poll_stop(net);

	hdr_size = vq->hdr_size;
@@ -508,12 +508,12 @@ static long vhost_net_set_backend(struct vhost_net *n, unsigned index, int fd) 
	/* Verify that ring has been setup correctly. */

	if (!vhost_vq_access_ok(vq)) {

		r = -EFAULT;

		goto err;

		goto err_vq;

	}

	sock = get_socket(fd);

	if (IS_ERR(sock)) {

		r = PTR_ERR(sock);

		goto err;

		goto err_vq;

	}



	/* start polling new socket */
@@ -524,12 +524,14 @@ static long vhost_net_set_backend(struct vhost_net *n, unsigned index, int fd) 
	vhost_net_disable_vq(n, vq);

	rcu_assign_pointer(vq->private_data, sock);

	vhost_net_enable_vq(n, vq);

	mutex_unlock(&vq->mutex);

done:

	if (oldsock) {

		vhost_net_flush_vq(n, index);

		fput(oldsock->file);

	}



err_vq:

	mutex_unlock(&vq->mutex);

err:

	mutex_unlock(&n->dev.mutex);

	return r;

drivers/vhost/vhost.c

+12 −6
Original line number Diff line number Diff line
@@ -476,8 +476,10 @@ static long vhost_set_vring(struct vhost_dev *d, int ioctl, void __user *argp) 
		if (r < 0)

			break;

		eventfp = f.fd == -1 ? NULL : eventfd_fget(f.fd);

		if (IS_ERR(eventfp))

			return PTR_ERR(eventfp);

		if (IS_ERR(eventfp)) {

			r = PTR_ERR(eventfp);

			break;

		}

		if (eventfp != vq->kick) {

			pollstop = filep = vq->kick;

			pollstart = vq->kick = eventfp;
@@ -489,8 +491,10 @@ static long vhost_set_vring(struct vhost_dev *d, int ioctl, void __user *argp) 
		if (r < 0)

			break;

		eventfp = f.fd == -1 ? NULL : eventfd_fget(f.fd);

		if (IS_ERR(eventfp))

			return PTR_ERR(eventfp);

		if (IS_ERR(eventfp)) {

			r = PTR_ERR(eventfp);

			break;

		}

		if (eventfp != vq->call) {

			filep = vq->call;

			ctx = vq->call_ctx;
@@ -505,8 +509,10 @@ static long vhost_set_vring(struct vhost_dev *d, int ioctl, void __user *argp) 
		if (r < 0)

			break;

		eventfp = f.fd == -1 ? NULL : eventfd_fget(f.fd);

		if (IS_ERR(eventfp))

			return PTR_ERR(eventfp);

		if (IS_ERR(eventfp)) {

			r = PTR_ERR(eventfp);

			break;

		}

		if (eventfp != vq->error) {

			filep = vq->error;

			vq->error = eventfp;