aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
Diffstat (limited to 'fs')
-rw-r--r--fs/aio.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/aio.c b/fs/aio.c
index d18690bb03e9..ac1c1587aa02 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -348,7 +348,7 @@ void fastcall exit_aio(struct mm_struct *mm)
348 /* 348 /*
349 * Ensure we don't leave the ctx on the aio_wq 349 * Ensure we don't leave the ctx on the aio_wq
350 */ 350 */
351 flush_work(aio_wq, &ctx->wq.work); 351 cancel_work_sync(&ctx->wq.work);
352 352
353 if (1 != atomic_read(&ctx->users)) 353 if (1 != atomic_read(&ctx->users))
354 printk(KERN_DEBUG 354 printk(KERN_DEBUG
@@ -371,7 +371,7 @@ void fastcall __put_ioctx(struct kioctx *ctx)
371 BUG_ON(ctx->reqs_active); 371 BUG_ON(ctx->reqs_active);
372 372
373 cancel_delayed_work(&ctx->wq); 373 cancel_delayed_work(&ctx->wq);
374 flush_work(aio_wq, &ctx->wq.work); 374 cancel_work_sync(&ctx->wq.work);
375 aio_free_ring(ctx); 375 aio_free_ring(ctx);
376 mmdrop(ctx->mm); 376 mmdrop(ctx->mm);
377 ctx->mm = NULL; 377 ctx->mm = NULL;