diff options
author | Fabian Frederick <fabf@skynet.be> | 2014-04-22 01:26:58 -0400 |
---|---|---|
committer | Benjamin LaHaise <bcrl@kvack.org> | 2014-04-22 12:27:24 -0400 |
commit | d52a8f9ead60338306c4f03e9ce575c5f23a4b65 (patch) | |
tree | 4a69708c80c03401ee5e39db9cd210d894919487 /fs | |
parent | e02ba72aabfade4c9cd6e3263e9b57bf890ad25c (diff) |
fs/aio.c: Remove ctx parameter in kiocb_cancel
ctx is no longer used in kiocb_cancel since
57282d8fd74407 ("aio: Kill ki_users")
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: Benjamin LaHaise <bcrl@kvack.org>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/aio.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -477,7 +477,7 @@ void kiocb_set_cancel_fn(struct kiocb *req, kiocb_cancel_fn *cancel) | |||
477 | } | 477 | } |
478 | EXPORT_SYMBOL(kiocb_set_cancel_fn); | 478 | EXPORT_SYMBOL(kiocb_set_cancel_fn); |
479 | 479 | ||
480 | static int kiocb_cancel(struct kioctx *ctx, struct kiocb *kiocb) | 480 | static int kiocb_cancel(struct kiocb *kiocb) |
481 | { | 481 | { |
482 | kiocb_cancel_fn *old, *cancel; | 482 | kiocb_cancel_fn *old, *cancel; |
483 | 483 | ||
@@ -538,7 +538,7 @@ static void free_ioctx_users(struct percpu_ref *ref) | |||
538 | struct kiocb, ki_list); | 538 | struct kiocb, ki_list); |
539 | 539 | ||
540 | list_del_init(&req->ki_list); | 540 | list_del_init(&req->ki_list); |
541 | kiocb_cancel(ctx, req); | 541 | kiocb_cancel(req); |
542 | } | 542 | } |
543 | 543 | ||
544 | spin_unlock_irq(&ctx->ctx_lock); | 544 | spin_unlock_irq(&ctx->ctx_lock); |
@@ -1587,7 +1587,7 @@ SYSCALL_DEFINE3(io_cancel, aio_context_t, ctx_id, struct iocb __user *, iocb, | |||
1587 | 1587 | ||
1588 | kiocb = lookup_kiocb(ctx, iocb, key); | 1588 | kiocb = lookup_kiocb(ctx, iocb, key); |
1589 | if (kiocb) | 1589 | if (kiocb) |
1590 | ret = kiocb_cancel(ctx, kiocb); | 1590 | ret = kiocb_cancel(kiocb); |
1591 | else | 1591 | else |
1592 | ret = -EINVAL; | 1592 | ret = -EINVAL; |
1593 | 1593 | ||