diff options
| author | Linus Torvalds | 2021-11-01 10:17:11 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2021-11-01 10:17:11 -0700 |
| commit | b6773cdb0e9fa75993946753d12f05eb3bbf3bce (patch) | |
| tree | 0271b72314fc293dedc78b2584588adc87d90ef4 /block | |
| parent | 71ae42629e65edab618651c8ff9c88e1edd717aa (diff) | |
| parent | 6b19b766e8f077f29cdb47da5003469a85bbfb9c (diff) | |
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 'block')
| -rw-r--r-- | block/fops.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/block/fops.c b/block/fops.c index 3777c7b76eae..4e22b0794c82 100644 --- a/block/fops.c +++ b/block/fops.c @@ -163,7 +163,7 @@ static void blkdev_bio_end_io(struct bio *bio) ret = blk_status_to_errno(dio->bio.bi_status); } - dio->iocb->ki_complete(iocb, ret, 0); + dio->iocb->ki_complete(iocb, ret); bio_put(&dio->bio); } else { struct task_struct *waiter = dio->waiter; @@ -295,7 +295,7 @@ static void blkdev_bio_end_io_async(struct bio *bio) ret = blk_status_to_errno(bio->bi_status); } - iocb->ki_complete(iocb, ret, 0); + iocb->ki_complete(iocb, ret); if (dio->flags & DIO_SHOULD_DIRTY) { bio_check_pages_dirty(bio); |