1 files changed, 22 insertions, 17 deletions

diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index b950306838ad..6bbe0a939596 100644
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -51,18 +51,8 @@ static void blkg_free(struct blkcg_gq *blkg)
         if (!blkg)
                 return;
 
-        for (i = 0; i < BLKCG_MAX_POLS; i++) {
-                struct blkcg_policy *pol = blkcg_policy[i];
-                struct blkg_policy_data *pd = blkg->pd[i];
-
-                if (!pd)
-                        continue;
-
-                if (pol && pol->pd_exit_fn)
-                        pol->pd_exit_fn(blkg);
-
-                kfree(pd);
-        }
+        for (i = 0; i < BLKCG_MAX_POLS; i++)
+                kfree(blkg->pd[i]);
 
         blk_exit_rl(&blkg->rl);
         kfree(blkg);
@@ -114,10 +104,6 @@ static struct blkcg_gq *blkg_alloc(struct blkcg *blkcg, struct request_queue *q,
                 blkg->pd[i] = pd;
                 pd->blkg = blkg;
                 pd->plid = i;
-
-                /* invoke per-policy init */
-                if (pol->pd_init_fn)
-                        pol->pd_init_fn(blkg);
         }
 
         return blkg;
@@ -214,7 +200,7 @@ static struct blkcg_gq *blkg_create(struct blkcg *blkcg,
         }
         blkg = new_blkg;
 
-        /* link parent and insert */
+        /* link parent */
         if (blkcg_parent(blkcg)) {
                 blkg->parent = __blkg_lookup(blkcg_parent(blkcg), q, false);
                 if (WARN_ON_ONCE(!blkg->parent)) {
@@ -224,6 +210,15 @@ static struct blkcg_gq *blkg_create(struct blkcg *blkcg,
                 blkg_get(blkg->parent);
         }
 
+        /* invoke per-policy init */
+        for (i = 0; i < BLKCG_MAX_POLS; i++) {
+                struct blkcg_policy *pol = blkcg_policy[i];
+
+                if (blkg->pd[i] && pol->pd_init_fn)
+                        pol->pd_init_fn(blkg);
+        }
+
+        /* insert */
         spin_lock(&blkcg->lock);
         ret = radix_tree_insert(&blkcg->blkg_tree, q->id, blkg);
         if (likely(!ret)) {
@@ -381,6 +376,16 @@ static void blkg_rcu_free(struct rcu_head *rcu_head)
 
 void __blkg_release(struct blkcg_gq *blkg)
 {
+        int i;
+
+        /* tell policies that this one is being freed */
+        for (i = 0; i < BLKCG_MAX_POLS; i++) {
+                struct blkcg_policy *pol = blkcg_policy[i];
+
+                if (blkg->pd[i] && pol->pd_exit_fn)
+                        pol->pd_exit_fn(blkg);
+        }
+
         /* release the blkcg and parent blkg refs this blkg has been holding */
         css_put(&blkg->blkcg->css);
         if (blkg->parent)