Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[linux-2.6-block.git] / mm / nommu.c

diff --git a/mm/nommu.c b/mm/nommu.c
index 3fba2dc97c44bece0d6fb5754afdafb1dba6353e..e544508e2a4bc3e3dfa6190abdd3faf0616c95f2 100644 (file)
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -1016,7 +1016,7 @@ static int validate_mmap_request(struct file *file,
                 * device */
                if (!file->f_op->get_unmapped_area)
                        capabilities &= ~NOMMU_MAP_DIRECT;
-               if (!file->f_op->read)
+               if (!(file->f_mode & FMODE_CAN_READ))
                        capabilities &= ~NOMMU_MAP_COPY;
 
                /* The file shall have been opened with read permission. */
@@ -1240,7 +1240,7 @@ static int do_mmap_private(struct vm_area_struct *vma,
 
                old_fs = get_fs();
                set_fs(KERNEL_DS);
-               ret = vma->vm_file->f_op->read(vma->vm_file, base, len, &fpos);
+               ret = __vfs_read(vma->vm_file, base, len, &fpos);
                set_fs(old_fs);
 
                if (ret < 0)