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 /drivers/block | |
| parent | f6c99aad4d9f3521fe38e552fd2a2e12cdc52418 (diff) | |
| parent | 0eb8af4916a540c362a2950e5ab54eca32eb7d58 (diff) | |
| download | linux-stable-653a7746fa2f5369985f5368ffc162b6510db6c8.tar.gz linux-stable-653a7746fa2f5369985f5368ffc162b6510db6c8.tar.bz2 linux-stable-653a7746fa2f5369985f5368ffc162b6510db6c8.zip | |
Merge remote-tracking branch 'ovl/for-viro' into for-linus
Overlayfs-related series from Miklos and Amir
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/loop.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/loop.c b/drivers/block/loop.c index 304377182c1a..f52b88b8dfd0 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -501,9 +501,9 @@ static int lo_rw_aio(struct loop_device *lo, struct loop_cmd *cmd, cmd->iocb.ki_flags = IOCB_DIRECT; if (rw == WRITE) - ret = file->f_op->write_iter(&cmd->iocb, &iter); + ret = call_write_iter(file, &cmd->iocb, &iter); else - ret = file->f_op->read_iter(&cmd->iocb, &iter); + ret = call_read_iter(file, &cmd->iocb, &iter); if (ret != -EIOCBQUEUED) cmd->iocb.ki_complete(&cmd->iocb, ret, 0); |