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

Commit f74ac015 authored by Miklos Szeredi's avatar Miklos Szeredi
Browse files

mm: use helper for calling f_op->mmap() 



Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
parent bb7462b6

drivers/gpu/drm/i915/i915_gem_dmabuf.c

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ static int i915_gem_dmabuf_mmap(struct dma_buf *dma_buf, struct vm_area_struct * 
	if (!obj->base.filp)

		return -ENODEV;



	ret = obj->base.filp->f_op->mmap(obj->base.filp, vma);

	ret = call_mmap(obj->base.filp, vma);

	if (ret)

		return ret;

drivers/gpu/drm/vgem/vgem_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ static int vgem_prime_mmap(struct drm_gem_object *obj, 
	if (!obj->filp)

		return -ENODEV;



	ret = obj->filp->f_op->mmap(obj->filp, vma);

	ret = call_mmap(obj->filp, vma);

	if (ret)

		return ret;

fs/coda/file.c

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ coda_file_mmap(struct file *coda_file, struct vm_area_struct *vma) 
	cfi->cfi_mapcount++;

	spin_unlock(&cii->c_lock);



	return host_file->f_op->mmap(host_file, vma);

	return call_mmap(host_file, vma);

}



int coda_open(struct inode *coda_inode, struct file *coda_file)

include/linux/fs.h

+5 −0
Original line number Diff line number Diff line
@@ -1727,6 +1727,11 @@ static inline ssize_t call_write_iter(struct file *file, struct kiocb *kio, 
	return file->f_op->write_iter(kio, iter);

}



static inline int call_mmap(struct file *file, struct vm_area_struct *vma)

{

	return file->f_op->mmap(file, vma);

}



ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector,

			      unsigned long nr_segs, unsigned long fast_segs,

			      struct iovec *fast_pointer,

ipc/shm.c

+1 −1
Original line number Diff line number Diff line
@@ -423,7 +423,7 @@ static int shm_mmap(struct file *file, struct vm_area_struct *vma) 
	if (ret)

		return ret;



	ret = sfd->file->f_op->mmap(sfd->file, vma);

	ret = call_mmap(sfd->file, vma);

	if (ret) {

		shm_close(vma);

		return ret;