Skip to content

Commit

Permalink
fs/aio.c: Remove ctx parameter in kiocb_cancel
Browse files Browse the repository at this point in the history
ctx is no longer used in kiocb_cancel since

57282d8 ("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>
  • Loading branch information
Fabian Frederick authored and Benjamin LaHaise committed Apr 22, 2014
1 parent e02ba72 commit d52a8f9
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions fs/aio.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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;

Expand Down

0 comments on commit d52a8f9

Please sign in to comment.