diff options
| author | Fabian Frederick <fabf@skynet.be> | 2014-04-22 07:26:58 +0200 |
|---|---|---|
| committer | Benjamin LaHaise <bcrl@kvack.org> | 2014-04-22 18:27:24 +0200 |
| commit | d52a8f9ead60338306c4f03e9ce575c5f23a4b65 (patch) | |
| tree | 4a69708c80c03401ee5e39db9cd210d894919487 | |
| parent | aio: block io_destroy() until all context requests are completed (diff) | |
| download | linux-d52a8f9ead60338306c4f03e9ce575c5f23a4b65.tar.xz linux-d52a8f9ead60338306c4f03e9ce575c5f23a4b65.zip | |
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>
| -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) } EXPORT_SYMBOL(kiocb_set_cancel_fn); -static int kiocb_cancel(struct kioctx *ctx, struct kiocb *kiocb) +static int kiocb_cancel(struct kiocb *kiocb) { kiocb_cancel_fn *old, *cancel; @@ -538,7 +538,7 @@ static void free_ioctx_users(struct percpu_ref *ref) struct kiocb, ki_list); list_del_init(&req->ki_list); - kiocb_cancel(ctx, req); + kiocb_cancel(req); } spin_unlock_irq(&ctx->ctx_lock); @@ -1587,7 +1587,7 @@ SYSCALL_DEFINE3(io_cancel, aio_context_t, ctx_id, struct iocb __user *, iocb, kiocb = lookup_kiocb(ctx, iocb, key); if (kiocb) - ret = kiocb_cancel(ctx, kiocb); + ret = kiocb_cancel(kiocb); else ret = -EINVAL; |