Merge remote-tracking branch 'ovl/for-viro' into for-linus

Overlayfs-related series from Miklos and Amir
This commit is contained in:
Al Viro 2017-03-02 06:41:22 -05:00
commit 653a7746fa
14 changed files with 158 additions and 134 deletions

View file

@ -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;