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 /fs/splice.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 'fs/splice.c')
| -rw-r--r-- | fs/splice.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/splice.c b/fs/splice.c index 4ef78aa8ef61..eaafa3d8869a 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -307,7 +307,7 @@ ssize_t generic_file_splice_read(struct file *in, loff_t *ppos, idx = to.idx; init_sync_kiocb(&kiocb, in); kiocb.ki_pos = *ppos; - ret = in->f_op->read_iter(&kiocb, &to); + ret = call_read_iter(in, &kiocb, &to); if (ret > 0) { *ppos = kiocb.ki_pos; file_accessed(in); |