Commit 8e80645f authored by Benjamin LaHaise's avatar Benjamin LaHaise

adapt aio kick changes to ingo's work queues

parent 9f7b351d
...@@ -234,7 +234,7 @@ static struct kioctx *ioctx_alloc(unsigned nr_events) ...@@ -234,7 +234,7 @@ static struct kioctx *ioctx_alloc(unsigned nr_events)
init_waitqueue_head(&ctx->wait); init_waitqueue_head(&ctx->wait);
INIT_LIST_HEAD(&ctx->active_reqs); INIT_LIST_HEAD(&ctx->active_reqs);
INIT_TQUEUE(&ctx->tq, aio_kick_handler, ctx); INIT_WORK(&ctx->wq, aio_kick_handler, ctx);
if (aio_setup_ring(ctx) < 0) if (aio_setup_ring(ctx) < 0)
goto out_freectx; goto out_freectx;
...@@ -612,7 +612,7 @@ void kick_iocb(struct kiocb *iocb) ...@@ -612,7 +612,7 @@ void kick_iocb(struct kiocb *iocb)
spin_lock_irqsave(&ctx->ctx_lock, flags); spin_lock_irqsave(&ctx->ctx_lock, flags);
list_add_tail(&iocb->ki_run_list, &ctx->run_list); list_add_tail(&iocb->ki_run_list, &ctx->run_list);
spin_unlock_irqrestore(&ctx->ctx_lock, flags); spin_unlock_irqrestore(&ctx->ctx_lock, flags);
schedule_task(&ctx->tq); schedule_work(&ctx->wq);
} }
} }
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#define __LINUX__AIO_H #define __LINUX__AIO_H
#include <linux/list.h> #include <linux/list.h>
#include <linux/tqueue.h> #include <linux/workqueue.h>
#include <linux/aio_abi.h> #include <linux/aio_abi.h>
#include <asm/atomic.h> #include <asm/atomic.h>
...@@ -134,7 +134,7 @@ struct kioctx { ...@@ -134,7 +134,7 @@ struct kioctx {
struct aio_ring_info ring_info; struct aio_ring_info ring_info;
struct tq_struct tq; struct work_struct wq;
}; };
/* prototypes */ /* prototypes */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment