1 files changed, 1 insertions, 2 deletions
diff --git a/fs/aio.c b/fs/aio.c
index 9c3de88e2ead..a92d7547b6f6 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -211,8 +211,7 @@ static void __put_ioctx(struct kioctx *ctx)
        unsigned nr_events = ctx->max_reqs;
        BUG_ON(ctx->reqs_active);
-        cancel_delayed_work(&ctx->wq);
+        cancel_delayed_work_sync(&ctx->wq);
-        cancel_work_sync(&ctx->wq.work);
        aio_free_ring(ctx);
        mmdrop(ctx->mm);
        ctx->mm = NULL;

diff --git a/fs/aio.c b/fs/aio.c index 9c3de88e2ead..a92d7547b6f6 100644 --- a/fs/aio.c +++ b/fs/aio.c
@@ -211,8 +211,7 @@ static void __put_ioctx(struct kioctx *ctx)
211	unsigned nr_events = ctx->max_reqs;	211	unsigned nr_events = ctx->max_reqs;
212	BUG_ON(ctx->reqs_active);	212	BUG_ON(ctx->reqs_active);
213		213
214	cancel_delayed_work(&ctx->wq);	214	cancel_delayed_work_sync(&ctx->wq);
215	cancel_work_sync(&ctx->wq.work);
216	aio_free_ring(ctx);	215	aio_free_ring(ctx);
217	mmdrop(ctx->mm);	216	mmdrop(ctx->mm);
218	ctx->mm = NULL;	217	ctx->mm = NULL;