git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'ovl/for-viro' into for-linus
[sfrench/cifs-2.6.git]
/
drivers
/
block
/
loop.c
diff --git
a/drivers/block/loop.c
b/drivers/block/loop.c
index 304377182c1ad462b9832b7a5e9b1fb930ca62fa..f52b88b8dfd021fd27676b9556e9b98d569bc000 100644
(file)
--- 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)
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
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);
if (ret != -EIOCBQUEUED)
cmd->iocb.ki_complete(&cmd->iocb, ret, 0);