Commit 6665ca15 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull virtio fix from Michael Tsirkin:
 "A last minute regression fix.

  I thought we did a lot of testing, but a regression still managed to
  sneak in. The fix seems trivial"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  vhost: allow batching hint without size
parents 09688c01 95932ab2

drivers/vhost/vhost.c

+3 −1
Original line number Diff line number Diff line
@@ -1170,7 +1170,9 @@ ssize_t vhost_chr_write_iter(struct vhost_dev *dev, 
		goto done;

	}



	if (msg.size == 0) {

	if ((msg.type == VHOST_IOTLB_UPDATE ||

	     msg.type == VHOST_IOTLB_INVALIDATE) &&

	     msg.size == 0) {

		ret = -EINVAL;

		goto done;

	}