Commit ed61a132 authored Nov 03, 2018 by Linus Torvalds

Merge branch 'work.afs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull 9p fix from Al Viro:
 "Regression fix for net/9p handling of iov_iter; broken by braino when
  switching to iov_iter_is_kvec() et.al., spotted and fixed by Marc"

* 'work.afs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  iov_iter: Fix 9p virtio breakage

parents af102b33 2cbfdf4d

net/9p/trans_virtio.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -329,7 +329,7 @@ static int p9_get_mapped_pages(struct virtio_chan *chan,
	if (!iov_iter_count(data))		if (!iov_iter_count(data))
	return 0;		return 0;

	if (iov_iter_is_kvec(data)) {		if (!iov_iter_is_kvec(data)) {
	int n;		int n;
	/*		/*
	* We allow only p9_max_pages pinned. We wait for the		* We allow only p9_max_pages pinned. We wait for the

Admin message