diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2017-03-02 12:41:22 +0100 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2017-03-02 12:41:22 +0100 |
| commit | 653a7746fa2f5369985f5368ffc162b6510db6c8 (patch) | |
| tree | baafa7c7db343fe10a0cf47f27b1471f3c829b7b /mm/nommu.c | |
| parent | Merge branch 'work.namei' into for-linus (diff) | |
| parent | vfs: use helper for calling f_op->fsync() (diff) | |
| download | linux-653a7746fa2f5369985f5368ffc162b6510db6c8.tar.xz linux-653a7746fa2f5369985f5368ffc162b6510db6c8.zip | |
Merge remote-tracking branch 'ovl/for-viro' into for-linus
Overlayfs-related series from Miklos and Amir
Diffstat (limited to 'mm/nommu.c')
| -rw-r--r-- | mm/nommu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/nommu.c b/mm/nommu.c index bc964c26be8c..782e83a14535 100644 --- a/mm/nommu.c +++ b/mm/nommu.c @@ -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)); |