diff options
author | 2021-11-01 10:17:11 -0700 | |
---|---|---|
committer | 2021-11-01 10:17:11 -0700 | |
commit | b6773cdb0e9fa75993946753d12f05eb3bbf3bce (patch) | |
tree | 0271b72314fc293dedc78b2584588adc87d90ef4 /fs/ceph | |
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.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 'fs/ceph')
-rw-r--r-- | fs/ceph/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ceph/file.c b/fs/ceph/file.c index e61018d9764e..b129ea551378 100644 --- a/fs/ceph/file.c +++ b/fs/ceph/file.c @@ -1022,7 +1022,7 @@ static void ceph_aio_complete(struct inode *inode, ceph_put_cap_refs(ci, (aio_req->write ? CEPH_CAP_FILE_WR : CEPH_CAP_FILE_RD)); - aio_req->iocb->ki_complete(aio_req->iocb, ret, 0); + aio_req->iocb->ki_complete(aio_req->iocb, ret); ceph_free_cap_flush(aio_req->prealloc_cf); kfree(aio_req); |