diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-11-03 18:35:52 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-11-03 18:35:52 +0100 |
| commit | ed61a132cbbf7cadae7b255cd5083c8fadc77f31 (patch) | |
| tree | 2c089a675d1a5db15f9fc869bd6527c9ad5dcf21 /net/9p/trans_virtio.c | |
| parent | Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi (diff) | |
| parent | iov_iter: Fix 9p virtio breakage (diff) | |
| download | linux-ed61a132cbbf7cadae7b255cd5083c8fadc77f31.tar.xz linux-ed61a132cbbf7cadae7b255cd5083c8fadc77f31.zip | |
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
Diffstat (limited to 'net/9p/trans_virtio.c')
| -rw-r--r-- | net/9p/trans_virtio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c index 91981970f542..b1d39cabf125 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 |