1 files changed, 9 insertions, 9 deletions

diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index ec3f5e8ba564..d42d89ccce1b 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -14,6 +14,7 @@
 #include <linux/rbtree.h>
 #include <linux/ioprio.h>
 #include <linux/blktrace_api.h>
+#include "blk.h"
 #include "cfq.h"
 
 /*
@@ -3194,13 +3195,13 @@ static struct cfq_io_context *
 cfq_get_io_context(struct cfq_data *cfqd, gfp_t gfp_mask)
 {
         struct io_context *ioc = NULL;
-        struct cfq_io_context *cic;
+        struct cfq_io_context *cic = NULL;
 
         might_sleep_if(gfp_mask & __GFP_WAIT);
 
-        ioc = get_io_context(gfp_mask, cfqd->queue->node);
+        ioc = current_io_context(gfp_mask, cfqd->queue->node);
         if (!ioc)
-                return NULL;
+                goto err;
 
         cic = cfq_cic_lookup(cfqd, ioc);
         if (cic)
@@ -3211,10 +3212,10 @@ cfq_get_io_context(struct cfq_data *cfqd, gfp_t gfp_mask)
                 goto err;
 
         if (cfq_cic_link(cfqd, ioc, cic, gfp_mask))
-                goto err_free;
-
+                goto err;
 out:
-        smp_read_barrier_depends();
+        get_io_context(ioc);
+
         if (unlikely(ioc->ioprio_changed))
                 cfq_ioc_set_ioprio(ioc);
 
@@ -3223,10 +3224,9 @@ out:
                 cfq_ioc_set_cgroup(ioc);
 #endif
         return cic;
-err_free:
-        cfq_cic_free(cic);
 err:
-        put_io_context(ioc);
+        if (cic)
+                cfq_cic_free(cic);
         return NULL;
 }