2 files changed, 2 insertions, 4 deletions

diff --git a/mm/nommu.c b/mm/nommu.c
index 3fba2dc97c44..e544508e2a4b 100644
--- 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)
diff --git a/mm/shmem.c b/mm/shmem.c
index 80b360c7bcd1..1ea2400b5245 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -3118,8 +3118,6 @@ static const struct file_operations shmem_file_operations = {
         .mmap           = shmem_mmap,
 #ifdef CONFIG_TMPFS
         .llseek         = shmem_file_llseek,
-        .read           = new_sync_read,
-        .write          = new_sync_write,
         .read_iter      = shmem_file_read_iter,
         .write_iter     = generic_file_write_iter,
         .fsync          = noop_fsync,