summaryrefslogtreecommitdiffstats
path: root/fs/btrfs
diff options
context:
space:
mode:
authorMiao Xie <miaox@cn.fujitsu.com>2010-05-20 07:21:50 +0000
committerChris Mason <chris.mason@oracle.com>2010-06-11 11:46:12 -0400
commit058a457ef0ce28d595af53d6103db73332383cbc (patch)
tree7f17117d57c90839cd6d50e588cba0bca97a0de6 /fs/btrfs
parent0e4dcbef1c0c3e29f9c7f824359445d385b2649a (diff)
downloadlinux-stable-058a457ef0ce28d595af53d6103db73332383cbc.tar.gz
linux-stable-058a457ef0ce28d595af53d6103db73332383cbc.tar.bz2
linux-stable-058a457ef0ce28d595af53d6103db73332383cbc.zip
Btrfs: fix remap_file_pages error
when we use remap_file_pages() to remap a file, remap_file_pages always return error. It is because btrfs didn't set VM_CAN_NONLINEAR for vma. Signed-off-by: Miao Xie <miaox@cn.fujitsu.com> Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs')
-rw-r--r--fs/btrfs/file.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index abcb91867b56..ce0cd29efa9e 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -1189,8 +1189,15 @@ static const struct vm_operations_struct btrfs_file_vm_ops = {
static int btrfs_file_mmap(struct file *filp, struct vm_area_struct *vma)
{
- vma->vm_ops = &btrfs_file_vm_ops;
+ struct address_space *mapping = filp->f_mapping;
+
+ if (!mapping->a_ops->readpage)
+ return -ENOEXEC;
+
file_accessed(filp);
+ vma->vm_ops = &btrfs_file_vm_ops;
+ vma->vm_flags |= VM_CAN_NONLINEAR;
+
return 0;
}