mm: use helper for calling f_op->mmap()
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
This commit is contained in:
Родитель
bb7462b6fd
Коммит
f74ac01520
|
@ -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;
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -1668,7 +1668,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
|
|||
* new file must not have been exposed to user-space, yet.
|
||||
*/
|
||||
vma->vm_file = get_file(file);
|
||||
error = file->f_op->mmap(file, vma);
|
||||
error = call_mmap(file, vma);
|
||||
if (error)
|
||||
goto unmap_and_free_vma;
|
||||
|
||||
|
|
|
@ -1084,7 +1084,7 @@ static int do_mmap_shared_file(struct vm_area_struct *vma)
|
|||
{
|
||||
int ret;
|
||||
|
||||
ret = vma->vm_file->f_op->mmap(vma->vm_file, vma);
|
||||
ret = call_mmap(vma->vm_file, vma);
|
||||
if (ret == 0) {
|
||||
vma->vm_region->vm_top = vma->vm_region->vm_end;
|
||||
return 0;
|
||||
|
@ -1115,7 +1115,7 @@ static int do_mmap_private(struct vm_area_struct *vma,
|
|||
* - VM_MAYSHARE will be set if it may attempt to share
|
||||
*/
|
||||
if (capabilities & NOMMU_MAP_DIRECT) {
|
||||
ret = vma->vm_file->f_op->mmap(vma->vm_file, vma);
|
||||
ret = call_mmap(vma->vm_file, vma);
|
||||
if (ret == 0) {
|
||||
/* shouldn't return success if we're not sharing */
|
||||
BUG_ON(!(vma->vm_flags & VM_MAYSHARE));
|
||||
|
|
Загрузка…
Ссылка в новой задаче