1 files changed, 4 insertions, 4 deletions

diff --git a/fs/aio.c b/fs/aio.c
index a936b7fe4f69..e29ec485af25 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -75,7 +75,7 @@ static int __init aio_setup(void)
         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");
+        aio_wq = alloc_workqueue("aio", 0, 1);  /* used to limit concurrency */
         BUG_ON(!aio_wq);
 
         pr_debug("aio_setup: sizeof(struct page) = %d\n", (int)sizeof(struct page));
@@ -509,7 +509,7 @@ static inline void really_put_req(struct kioctx *ctx, struct kiocb *req)
         ctx->reqs_active--;
 
         if (unlikely(!ctx->reqs_active && ctx->dead))
-                wake_up(&ctx->wait);
+                wake_up_all(&ctx->wait);
 }
 
 static void aio_fput_routine(struct work_struct *data)
@@ -566,7 +566,7 @@ static int __aio_put_req(struct kioctx *ctx, struct kiocb *req)
                 spin_lock(&fput_lock);
                 list_add(&req->ki_list, &fput_head);
                 spin_unlock(&fput_lock);
-                queue_work(aio_wq, &fput_work);
+                schedule_work(&fput_work);
         } else {
                 req->ki_filp = NULL;
                 really_put_req(ctx, req);
@@ -1218,7 +1218,7 @@ static void io_destroy(struct kioctx *ioctx)
          * by other CPUs at this point.  Right now, we rely on the
          * locking done by the above calls to ensure this consistency.
          */
-        wake_up(&ioctx->wait);
+        wake_up_all(&ioctx->wait);
         put_ioctx(ioctx);       /* once for the lookup */
 }