unify flush_work/flush_work_keventd and rename it to cancel_work_sync

[mv-sheeva.git] / fs / aio.c

diff --git a/fs/aio.c b/fs/aio.c
index d18690bb03e9becaff3d098f3484fddb456a23d3..ac1c1587aa02dad4583b7a394cf1261e79a0c680 100644 (file)
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -348,7 +348,7 @@ void fastcall exit_aio(struct mm_struct *mm)
                /*
                 * Ensure we don't leave the ctx on the aio_wq
                 */
-               flush_work(aio_wq, &ctx->wq.work);
+               cancel_work_sync(&ctx->wq.work);
 
                if (1 != atomic_read(&ctx->users))
                        printk(KERN_DEBUG
@@ -371,7 +371,7 @@ void fastcall __put_ioctx(struct kioctx *ctx)
        BUG_ON(ctx->reqs_active);
 
        cancel_delayed_work(&ctx->wq);
-       flush_work(aio_wq, &ctx->wq.work);
+       cancel_work_sync(&ctx->wq.work);
        aio_free_ring(ctx);
        mmdrop(ctx->mm);
        ctx->mm = NULL;