summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Stabellini <stefano.stabellini@eu.citrix.com>2012-04-03 18:05:47 +0100
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2012-04-17 13:27:17 -0400
commite8e937be971d706061dc56220ff3605ab77622a7 (patch)
tree749380e841f6a07ffd5d9678fb88f008afd7f2ba
parent6b5e7d9ef793c55d72679f058514f33c4258f286 (diff)
downloadlinux-3.10-e8e937be971d706061dc56220ff3605ab77622a7.tar.gz
linux-3.10-e8e937be971d706061dc56220ff3605ab77622a7.tar.bz2
linux-3.10-e8e937be971d706061dc56220ff3605ab77622a7.zip
xen/gntdev: do not set VM_PFNMAP
Since we are using the m2p_override we do have struct pages corresponding to the user vma mmap'ed by gntdev. Removing the VM_PFNMAP flag makes get_user_pages work on that vma. An example test case would be using a Xen userspace block backend (QDISK) on a file on NFS using O_DIRECT. CC: stable@kernel.org Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
-rw-r--r--drivers/xen/gntdev.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/xen/gntdev.c b/drivers/xen/gntdev.c
index 99d8151c824..1ffd03bf8e1 100644
--- a/drivers/xen/gntdev.c
+++ b/drivers/xen/gntdev.c
@@ -722,7 +722,7 @@ static int gntdev_mmap(struct file *flip, struct vm_area_struct *vma)
vma->vm_flags |= VM_RESERVED|VM_DONTEXPAND;
if (use_ptemod)
- vma->vm_flags |= VM_DONTCOPY|VM_PFNMAP;
+ vma->vm_flags |= VM_DONTCOPY;
vma->vm_private_data = map;