1 files changed, 5 insertions, 8 deletions

diff --git a/fs/aio.c b/fs/aio.c
index e4598d6d49dd..ac1c1587aa02 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -68,10 +68,8 @@ static void aio_queue_work(struct kioctx *);
  */
 static int __init aio_setup(void)
 {
-        kiocb_cachep = kmem_cache_create("kiocb", sizeof(struct kiocb),
-                                0, SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL, NULL);
-        kioctx_cachep = kmem_cache_create("kioctx", sizeof(struct kioctx),
-                                0, SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL, NULL);
+        kiocb_cachep = KMEM_CACHE(kiocb, SLAB_HWCACHE_ALIGN|SLAB_PANIC);
+        kioctx_cachep = KMEM_CACHE(kioctx,SLAB_HWCACHE_ALIGN|SLAB_PANIC);
 
         aio_wq = create_workqueue("aio");
 
@@ -348,10 +346,9 @@ void fastcall exit_aio(struct mm_struct *mm)
 
                 wait_for_all_aios(ctx);
                 /*
-                 * this is an overkill, but ensures we don't leave
-                 * the ctx on the aio_wq
+                 * Ensure we don't leave the ctx on the aio_wq
                  */
-                flush_workqueue(aio_wq);
+                cancel_work_sync(&ctx->wq.work);
 
                 if (1 != atomic_read(&ctx->users))
                         printk(KERN_DEBUG
@@ -374,7 +371,7 @@ void fastcall __put_ioctx(struct kioctx *ctx)
         BUG_ON(ctx->reqs_active);
 
         cancel_delayed_work(&ctx->wq);
-        flush_workqueue(aio_wq);
+        cancel_work_sync(&ctx->wq.work);
         aio_free_ring(ctx);
         mmdrop(ctx->mm);
         ctx->mm = NULL;