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/mmap.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/mmap.c')
| -rw-r--r-- | mm/mmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/mmap.c b/mm/mmap.c index b729084eea90..2ffca2181a38 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -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; |