diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2017-03-02 06:41:22 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2017-03-02 06:41:22 -0500 |
| commit | 653a7746fa2f5369985f5368ffc162b6510db6c8 (patch) | |
| tree | baafa7c7db343fe10a0cf47f27b1471f3c829b7b /ipc | |
| parent | f6c99aad4d9f3521fe38e552fd2a2e12cdc52418 (diff) | |
| parent | 0eb8af4916a540c362a2950e5ab54eca32eb7d58 (diff) | |
| download | op-kernel-dev-653a7746fa2f5369985f5368ffc162b6510db6c8.zip op-kernel-dev-653a7746fa2f5369985f5368ffc162b6510db6c8.tar.gz | |
Merge remote-tracking branch 'ovl/for-viro' into for-linus
Overlayfs-related series from Miklos and Amir
Diffstat (limited to 'ipc')
| -rw-r--r-- | ipc/shm.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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; @@ -452,7 +452,7 @@ static int shm_fsync(struct file *file, loff_t start, loff_t end, int datasync) if (!sfd->file->f_op->fsync) return -EINVAL; - return sfd->file->f_op->fsync(sfd->file, start, end, datasync); + return call_fsync(sfd->file, start, end, datasync); } static long shm_fallocate(struct file *file, int mode, loff_t offset, |
