1 files changed, 6 insertions, 5 deletions

diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index b8c143d68ee0..fa8f26309444 100644
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -1655,11 +1655,12 @@ static void blkiocg_attach(struct cgroup_subsys *ss, struct cgroup *cgrp,
         struct io_context *ioc;
 
         cgroup_taskset_for_each(task, cgrp, tset) {
-                task_lock(task);
-                ioc = task->io_context;
-                if (ioc)
-                        ioc->cgroup_changed = 1;
-                task_unlock(task);
+                /* we don't lose anything even if ioc allocation fails */
+                ioc = get_task_io_context(task, GFP_ATOMIC, NUMA_NO_NODE);
+                if (ioc) {
+                        ioc_cgroup_changed(ioc);
+                        put_io_context(ioc, NULL);
+                }
         }
 }