1 files changed, 4 insertions, 6 deletions

diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index fe00b3b983a8..2606d0fb4e54 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -702,7 +702,7 @@ static int rebind_subsystems(struct cgroupfs_root *root,
          * any child cgroups exist. This is theoretically supportable
          * but involves complex error handling, so it's being left until
          * later */
-        if (!list_empty(&cgrp->children))
+        if (root->number_of_cgroups > 1)
                 return -EBUSY;
 
         /* Process each subsystem */
@@ -1024,7 +1024,7 @@ static int cgroup_get_sb(struct file_system_type *fs_type,
                 if (ret == -EBUSY) {
                         mutex_unlock(&cgroup_mutex);
                         mutex_unlock(&inode->i_mutex);
-                        goto drop_new_super;
+                        goto free_cg_links;
                 }
 
                 /* EBUSY should be the only error here */
@@ -1073,10 +1073,11 @@ static int cgroup_get_sb(struct file_system_type *fs_type,
 
         return simple_set_mnt(mnt, sb);
 
+ free_cg_links:
+        free_cg_links(&tmp_cg_links);
  drop_new_super:
         up_write(&sb->s_umount);
         deactivate_super(sb);
-        free_cg_links(&tmp_cg_links);
         return ret;
 }
 
@@ -2934,9 +2935,6 @@ int cgroup_clone(struct task_struct *tsk, struct cgroup_subsys *subsys,
  again:
         root = subsys->root;
         if (root == &rootnode) {
-                printk(KERN_INFO
-                       "Not cloning cgroup for unused subsystem %s\n",
-                       subsys->name);
                 mutex_unlock(&cgroup_mutex);
                 return 0;
         }