1 files changed, 8 insertions, 12 deletions

diff --git a/block/blk-ioc.c b/block/blk-ioc.c
index d4ed6000147d..d22c4c55c406 100644
--- a/block/blk-ioc.c
+++ b/block/blk-ioc.c
@@ -7,6 +7,7 @@
 #include <linux/bio.h>
 #include <linux/blkdev.h>
 #include <linux/bootmem.h>      /* for max_pfn/max_low_pfn */
+#include <linux/slab.h>
 
 #include "blk.h"
 
@@ -39,8 +40,6 @@ int put_io_context(struct io_context *ioc)
 
         if (atomic_long_dec_and_test(&ioc->refcount)) {
                 rcu_read_lock();
-                if (ioc->aic && ioc->aic->dtor)
-                        ioc->aic->dtor(ioc->aic);
                 cfq_dtor(ioc);
                 rcu_read_unlock();
 
@@ -66,22 +65,20 @@ static void cfq_exit(struct io_context *ioc)
 }
 
 /* Called by the exitting task */
-void exit_io_context(void)
+void exit_io_context(struct task_struct *task)
 {
         struct io_context *ioc;
 
-        task_lock(current);
-        ioc = current->io_context;
-        current->io_context = NULL;
-        task_unlock(current);
+        task_lock(task);
+        ioc = task->io_context;
+        task->io_context = NULL;
+        task_unlock(task);
 
         if (atomic_dec_and_test(&ioc->nr_tasks)) {
-                if (ioc->aic && ioc->aic->exit)
-                        ioc->aic->exit(ioc->aic);
                 cfq_exit(ioc);
 
-                put_io_context(ioc);
         }
+        put_io_context(ioc);
 }
 
 struct io_context *alloc_io_context(gfp_t gfp_flags, int node)
@@ -95,9 +92,8 @@ struct io_context *alloc_io_context(gfp_t gfp_flags, int node)
                 spin_lock_init(&ret->lock);
                 ret->ioprio_changed = 0;
                 ret->ioprio = 0;
-                ret->last_waited = jiffies; /* doesn't matter... */
+                ret->last_waited = 0; /* doesn't matter... */
                 ret->nr_batch_requests = 0; /* because this is 0 */
-                ret->aic = NULL;
                 INIT_RADIX_TREE(&ret->radix_root, GFP_ATOMIC | __GFP_HIGH);
                 INIT_HLIST_HEAD(&ret->cic_list);
                 ret->ioc_data = NULL;