1 files changed, 5 insertions, 3 deletions

diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 7868fc3c0bc5..c06aa5e257a8 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -1638,7 +1638,7 @@ destroy_root:
 exit_root_id:
         cgroup_exit_root_id(root);
 cancel_ref:
-        percpu_ref_cancel_init(&root_cgrp->self.refcnt);
+        percpu_ref_exit(&root_cgrp->self.refcnt);
 out:
         free_cgrp_cset_links(&tmp_links);
         return ret;
@@ -4133,6 +4133,8 @@ static void css_free_work_fn(struct work_struct *work)
                 container_of(work, struct cgroup_subsys_state, destroy_work);
         struct cgroup *cgrp = css->cgroup;
 
+        percpu_ref_exit(&css->refcnt);
+
         if (css->ss) {
                 /* css free path */
                 if (css->parent)
@@ -4330,7 +4332,7 @@ err_list_del:
 err_free_id:
         cgroup_idr_remove(&ss->css_idr, css->id);
 err_free_percpu_ref:
-        percpu_ref_cancel_init(&css->refcnt);
+        percpu_ref_exit(&css->refcnt);
 err_free_css:
         call_rcu(&css->rcu_head, css_free_rcu_fn);
         return err;
@@ -4441,7 +4443,7 @@ static int cgroup_mkdir(struct kernfs_node *parent_kn, const char *name,
 out_free_id:
         cgroup_idr_remove(&root->cgroup_idr, cgrp->id);
 out_cancel_ref:
-        percpu_ref_cancel_init(&cgrp->self.refcnt);
+        percpu_ref_exit(&cgrp->self.refcnt);
 out_free_cgrp:
         kfree(cgrp);
 out_unlock: