62 lines
1.9 KiB
Diff
62 lines
1.9 KiB
Diff
From: Al Viro <viro@zeniv.linux.org.uk>
|
|
Date: Mon, 11 Mar 2019 19:00:36 -0400
|
|
Subject: [11/14] aio: fold lookup_kiocb() into its sole caller
|
|
Origin: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/commit?id=592ea630b081a6c97ec56499b0e12f68fd2da2d8
|
|
|
|
commit 833f4154ed560232120bc475935ee1d6a20e159f upstream.
|
|
|
|
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
|
|
Cc: Guenter Roeck <linux@roeck-us.net>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
fs/aio.c | 29 +++++++----------------------
|
|
1 file changed, 7 insertions(+), 22 deletions(-)
|
|
|
|
diff --git a/fs/aio.c b/fs/aio.c
|
|
index 10e5a8f52dce..cda193f6de76 100644
|
|
--- a/fs/aio.c
|
|
+++ b/fs/aio.c
|
|
@@ -1992,24 +1992,6 @@ COMPAT_SYSCALL_DEFINE3(io_submit, compat_aio_context_t, ctx_id,
|
|
}
|
|
#endif
|
|
|
|
-/* lookup_kiocb
|
|
- * Finds a given iocb for cancellation.
|
|
- */
|
|
-static struct aio_kiocb *
|
|
-lookup_kiocb(struct kioctx *ctx, struct iocb __user *iocb)
|
|
-{
|
|
- struct aio_kiocb *kiocb;
|
|
-
|
|
- assert_spin_locked(&ctx->ctx_lock);
|
|
-
|
|
- /* TODO: use a hash or array, this sucks. */
|
|
- list_for_each_entry(kiocb, &ctx->active_reqs, ki_list) {
|
|
- if (kiocb->ki_user_iocb == iocb)
|
|
- return kiocb;
|
|
- }
|
|
- return NULL;
|
|
-}
|
|
-
|
|
/* sys_io_cancel:
|
|
* Attempts to cancel an iocb previously passed to io_submit. If
|
|
* the operation is successfully cancelled, the resulting event is
|
|
@@ -2038,10 +2020,13 @@ SYSCALL_DEFINE3(io_cancel, aio_context_t, ctx_id, struct iocb __user *, iocb,
|
|
return -EINVAL;
|
|
|
|
spin_lock_irq(&ctx->ctx_lock);
|
|
- kiocb = lookup_kiocb(ctx, iocb);
|
|
- if (kiocb) {
|
|
- ret = kiocb->ki_cancel(&kiocb->rw);
|
|
- list_del_init(&kiocb->ki_list);
|
|
+ /* TODO: use a hash or array, this sucks. */
|
|
+ list_for_each_entry(kiocb, &ctx->active_reqs, ki_list) {
|
|
+ if (kiocb->ki_user_iocb == iocb) {
|
|
+ ret = kiocb->ki_cancel(&kiocb->rw);
|
|
+ list_del_init(&kiocb->ki_list);
|
|
+ break;
|
|
+ }
|
|
}
|
|
spin_unlock_irq(&ctx->ctx_lock);
|
|
|