AIO: Move aio_cancel_all() after aio_complete()
RFC PATCH v2 1/3 AIO: Move aio_cancel_all() after aio_complete()
Signed-off-by Sergey Temerkhanov<[email protected]>
This patch moves aio_cancel_all() after aio_complete()
fs/aio.c +29 -27
@@ -63,6 +63,8 @@static void aio_kick_handler (struct work_struct *);static void aio_queue_work (struct kioctx *); +static void aio_cancel_all (struct kioctx *); +/* aio_setup * Creates the slab caches used by the aio routines, panic on * failure as this is done early during the boot sequence.
@@ -315,33 +317,6 @@return ctx; } -/* aio_cancel_all -* Cancels all outstanding aio requests on an aio context. Used -* when the processes owning a context have all exited to encourage -* the rapid destruction of the kioctx. -*/ -static void aio_cancel_all (struct kioctx *ctx) -{ -int (*cancel)(struct kiocb *,struct io_event *); -struct io_event res; -spin_lock_irq (&ctx->ctx_lock); - ctx->dead =1 ; -while (!list_empty (&ctx->active_reqs)) { -struct list_head *pos = ctx->active_reqs.next; -struct kiocb *iocb =list_kiocb (pos); -list_del_init (&iocb->ki_list); - cancel = iocb->ki_cancel; -kiocbSetCancelled (iocb); -if (cancel) { - iocb->ki_users++; -spin_unlock_irq (&ctx->ctx_lock); -cancel (iocb, &res); -spin_lock_irq (&ctx->ctx_lock); - } - } -spin_unlock_irq (&ctx->ctx_lock); -} -static void wait_for_all_aios (struct kioctx *ctx) {struct task_struct *tsk = current;
@@ -1041,6 +1016,33 @@return ret; } +/* aio_cancel_all +* Cancels all outstanding aio requests on an aio context. Used +* when the processes owning a context have all exited to encourage +* the rapid destruction of the kioctx. +*/ +static void aio_cancel_all (struct kioctx *ctx) +{ +int (*cancel)(struct kiocb *,struct io_event *); +struct io_event res; +spin_lock_irq (&ctx->ctx_lock); + ctx->dead =1 ; +while (!list_empty (&ctx->active_reqs)) { +struct list_head *pos = ctx->active_reqs.next; +struct kiocb *iocb =list_kiocb (pos); +list_del_init (&iocb->ki_list); + cancel = iocb->ki_cancel; +kiocbSetCancelled (iocb); +if (cancel) { + iocb->ki_users++; +spin_unlock_irq (&ctx->ctx_lock); +cancel (iocb, &res); +spin_lock_irq (&ctx->ctx_lock); + } + } +spin_unlock_irq (&ctx->ctx_lock); +} +/* aio_read_evt * Pull an event off of the ioctx's event ring. Returns the number of * events fetched (0 or 1 ;-)