aboutsummaryrefslogtreecommitdiff
path: root/fs/fuse
diff options
context:
space:
mode:
authorGravatar Linus Torvalds <torvalds@linux-foundation.org> 2021-11-01 10:17:11 -0700
committerGravatar Linus Torvalds <torvalds@linux-foundation.org> 2021-11-01 10:17:11 -0700
commitb6773cdb0e9fa75993946753d12f05eb3bbf3bce (patch)
tree0271b72314fc293dedc78b2584588adc87d90ef4 /fs/fuse
parentMerge tag 'for-5.16/passthrough-flag-2021-10-29' of git://git.kernel.dk/linux... (diff)
parentfs: get rid of the res2 iocb->ki_complete argument (diff)
downloadlinux-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/fuse')
-rw-r--r--fs/fuse/file.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index 11404f8c21c7..e6039f22311b 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -687,7 +687,7 @@ static void fuse_aio_complete(struct fuse_io_priv *io, int err, ssize_t pos)
spin_unlock(&fi->lock);
}
- io->iocb->ki_complete(io->iocb, res, 0);
+ io->iocb->ki_complete(io->iocb, res);
}
kref_put(&io->refcnt, fuse_io_release);