1 files changed, 8 insertions, 1 deletions

diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index c6e77ef2a0a6..2e9b387971d1 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -2769,13 +2769,17 @@ static void cgroup_cfts_commit(struct cgroup_subsys *ss,
 {
         LIST_HEAD(pending);
         struct cgroup *cgrp, *n;
+        struct super_block *sb = ss->root->sb;
 
         /* %NULL @cfts indicates abort and don't bother if @ss isn't attached */
-        if (cfts && ss->root != &rootnode) {
+        if (cfts && ss->root != &rootnode &&
+            atomic_inc_not_zero(&sb->s_active)) {
                 list_for_each_entry(cgrp, &ss->root->allcg_list, allcg_node) {
                         dget(cgrp->dentry);
                         list_add_tail(&cgrp->cft_q_node, &pending);
                 }
+        } else {
+                sb = NULL;
         }
 
         mutex_unlock(&cgroup_mutex);
@@ -2798,6 +2802,9 @@ static void cgroup_cfts_commit(struct cgroup_subsys *ss,
                 dput(cgrp->dentry);
         }
 
+        if (sb)
+                deactivate_super(sb);
+
         mutex_unlock(&cgroup_cft_mutex);
 }