diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-11-01 10:17:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-11-01 10:17:11 -0700 |
| commit | b6773cdb0e9fa75993946753d12f05eb3bbf3bce (patch) | |
| tree | 0271b72314fc293dedc78b2584588adc87d90ef4 /drivers/target | |
| parent | 71ae42629e65edab618651c8ff9c88e1edd717aa (diff) | |
| parent | 6b19b766e8f077f29cdb47da5003469a85bbfb9c (diff) | |
| download | linux-b6773cdb0e9fa75993946753d12f05eb3bbf3bce.tar.gz linux-b6773cdb0e9fa75993946753d12f05eb3bbf3bce.tar.bz2 linux-b6773cdb0e9fa75993946753d12f05eb3bbf3bce.zip | |
Merge tag 'for-5.16/ki_complete-2021-10-29' of git://git.kernel.dk/linux-block
Pull kiocb->ki_complete() cleanup from Jens Axboe:
"This removes the res2 argument from kiocb->ki_complete().
Only the USB gadget code used it, everybody else passes 0. The USB
guys checked the user gadget code they could find, and everybody just
uses res as expected for the async interface"
* tag 'for-5.16/ki_complete-2021-10-29' of git://git.kernel.dk/linux-block:
fs: get rid of the res2 iocb->ki_complete argument
usb: remove res2 argument from gadget code completions
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 02f64453b4c5..8190b840065f 100644 --- a/drivers/target/target_core_file.c +++ b/drivers/target/target_core_file.c @@ -245,7 +245,7 @@ struct target_core_file_cmd { struct bio_vec bvecs[]; }; -static void cmd_rw_aio_complete(struct kiocb *iocb, long ret, long ret2) +static void cmd_rw_aio_complete(struct kiocb *iocb, long ret) { struct target_core_file_cmd *cmd; @@ -303,7 +303,7 @@ fd_execute_rw_aio(struct se_cmd *cmd, struct scatterlist *sgl, u32 sgl_nents, ret = call_read_iter(file, &aio_cmd->iocb, &iter); if (ret != -EIOCBQUEUED) - cmd_rw_aio_complete(&aio_cmd->iocb, ret, 0); + cmd_rw_aio_complete(&aio_cmd->iocb, ret); return 0; } |