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

ed61a132 · Linus Torvalds <[email protected]> · 2018-11-03 10:35:52 -07:00

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

Commit: ed61a132cbbf7cadae7b255cd5083c8fadc77f31
Parents: af102b33 · 2cbfdf4d

Merge commit. Changes below are compared with the first parent: af102b33.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
net/9p/trans_virtio.c	modified	+1	−1	View file

net/9p/trans_virtio.c

View file

diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c
index 9198197..b1d39ca 100644
--- a/net/9p/trans_virtio.c
+++ b/net/9p/trans_virtio.c
@@ -329,7 +329,7 @@ static int p9_get_mapped_pages(struct virtio_chan *chan,
 	if (!iov_iter_count(data))
 		return 0;
 
-	if (iov_iter_is_kvec(data)) {
+	if (!iov_iter_is_kvec(data)) {
 		int n;
 		/*
 		 * We allow only p9_max_pages pinned. We wait for the