| Message ID | 20180104080043.14506-29-hch@lst.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
diff --git a/fs/aio.c b/fs/aio.c index 6204c1b81a36..99c1d2ad67e9 100644 --- a/fs/aio.c +++ b/fs/aio.c @@ -561,6 +561,8 @@ static int kiocb_cancel(struct aio_kiocb *kiocb) { kiocb_cancel_fn *cancel = kiocb->ki_cancel; + list_del_init(&kiocb->ki_list); + if (!cancel) return -EINVAL; kiocb->ki_cancel = NULL; @@ -607,8 +609,6 @@ static void free_ioctx_users(struct percpu_ref *ref) while (!list_empty(&ctx->active_reqs)) { req = list_first_entry(&ctx->active_reqs, struct aio_kiocb, ki_list); - - list_del_init(&req->ki_list); kiocb_cancel(req); }
One we cancel an iocb there is no reason to keep it on the active_reqs list, given that the list is only used to look for cancelation candidates. Signed-off-by: Christoph Hellwig <hch@lst.de> --- fs/aio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)