Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e242a1c authored by Al Viro's avatar Al Viro
Browse files

nommu: use __vfs_read() 



... instead of open-coding the call of ->read()

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent d0f88f8d

mm/nommu.c

+2 −2
Original line number Diff line number Diff line
@@ -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)