diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-21 13:11:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-21 13:11:44 -0700 |
| commit | b6394d6f715919c053c1450ef0d7c5e517b53764 (patch) | |
| tree | 4aa911757dd8ef6949fcb79daaaae3aa87d709e6 /drivers/target | |
| parent | 3413efa8885d7a714c54c6752eaf49fd17d351c9 (diff) | |
| parent | 7c98f7cb8fda964fbc60b9307ad35e94735fa35f (diff) | |
| download | lwn-b6394d6f715919c053c1450ef0d7c5e517b53764.tar.gz lwn-b6394d6f715919c053c1450ef0d7c5e517b53764.zip | |
Merge tag 'pull-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull misc vfs updates from Al Viro:
"Assorted commits that had missed the last merge window..."
* tag 'pull-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
remove call_{read,write}_iter() functions
do_dentry_open(): kill inode argument
kernel_file_open(): get rid of inode argument
get_file_rcu(): no need to check for NULL separately
fd_is_open(): move to fs/file.c
close_on_exec(): pass files_struct instead of fdtable
Diffstat (limited to 'drivers/target')
| -rw-r--r-- | drivers/target/target_core_file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/target/target_core_file.c b/drivers/target/target_core_file.c index 4d447520bab8..94e6cd4e7e43 100644 --- a/drivers/target/target_core_file.c +++ b/drivers/target/target_core_file.c @@ -299,9 +299,9 @@ fd_execute_rw_aio(struct se_cmd *cmd, struct scatterlist *sgl, u32 sgl_nents, aio_cmd->iocb.ki_flags |= IOCB_DSYNC; if (is_write) - ret = call_write_iter(file, &aio_cmd->iocb, &iter); + ret = file->f_op->write_iter(&aio_cmd->iocb, &iter); else - ret = call_read_iter(file, &aio_cmd->iocb, &iter); + ret = file->f_op->read_iter(&aio_cmd->iocb, &iter); if (ret != -EIOCBQUEUED) cmd_rw_aio_complete(&aio_cmd->iocb, ret); |