diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-11-01 18:17:11 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-11-01 18:17:11 +0100 |
| commit | b6773cdb0e9fa75993946753d12f05eb3bbf3bce (patch) | |
| tree | 0271b72314fc293dedc78b2584588adc87d90ef4 /drivers/block | |
| parent | Merge tag 'for-5.16/passthrough-flag-2021-10-29' of git://git.kernel.dk/linux... (diff) | |
| parent | fs: get rid of the res2 iocb->ki_complete argument (diff) | |
| download | linux-b6773cdb0e9fa75993946753d12f05eb3bbf3bce.tar.xz 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/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 f094de5f0056..3c09a33fa1c7 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -382,7 +382,7 @@ static void lo_rw_aio_do_completion(struct loop_cmd *cmd) blk_mq_complete_request(rq); } -static void lo_rw_aio_complete(struct kiocb *iocb, long ret, long ret2) +static void lo_rw_aio_complete(struct kiocb *iocb, long ret) { struct loop_cmd *cmd = container_of(iocb, struct loop_cmd, iocb); @@ -455,7 +455,7 @@ static int lo_rw_aio(struct loop_device *lo, struct loop_cmd *cmd, lo_rw_aio_do_completion(cmd); if (ret != -EIOCBQUEUED) - cmd->iocb.ki_complete(&cmd->iocb, ret, 0); + lo_rw_aio_complete(&cmd->iocb, ret); return 0; } |