diff options
Diffstat (limited to 'kernel/cgroup.c')
| -rw-r--r-- | kernel/cgroup.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index 8185a0f09594..2606d0fb4e54 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c | |||
| @@ -1024,7 +1024,7 @@ static int cgroup_get_sb(struct file_system_type *fs_type, | |||
| 1024 | if (ret == -EBUSY) { | 1024 | if (ret == -EBUSY) { |
| 1025 | mutex_unlock(&cgroup_mutex); | 1025 | mutex_unlock(&cgroup_mutex); |
| 1026 | mutex_unlock(&inode->i_mutex); | 1026 | mutex_unlock(&inode->i_mutex); |
| 1027 | goto drop_new_super; | 1027 | goto free_cg_links; |
| 1028 | } | 1028 | } |
| 1029 | 1029 | ||
| 1030 | /* EBUSY should be the only error here */ | 1030 | /* EBUSY should be the only error here */ |
| @@ -1073,10 +1073,11 @@ static int cgroup_get_sb(struct file_system_type *fs_type, | |||
| 1073 | 1073 | ||
| 1074 | return simple_set_mnt(mnt, sb); | 1074 | return simple_set_mnt(mnt, sb); |
| 1075 | 1075 | ||
| 1076 | free_cg_links: | ||
| 1077 | free_cg_links(&tmp_cg_links); | ||
| 1076 | drop_new_super: | 1078 | drop_new_super: |
| 1077 | up_write(&sb->s_umount); | 1079 | up_write(&sb->s_umount); |
| 1078 | deactivate_super(sb); | 1080 | deactivate_super(sb); |
| 1079 | free_cg_links(&tmp_cg_links); | ||
| 1080 | return ret; | 1081 | return ret; |
| 1081 | } | 1082 | } |
| 1082 | 1083 | ||
| @@ -2934,9 +2935,6 @@ int cgroup_clone(struct task_struct *tsk, struct cgroup_subsys *subsys, | |||
| 2934 | again: | 2935 | again: |
| 2935 | root = subsys->root; | 2936 | root = subsys->root; |
| 2936 | if (root == &rootnode) { | 2937 | if (root == &rootnode) { |
| 2937 | printk(KERN_INFO | ||
| 2938 | "Not cloning cgroup for unused subsystem %s\n", | ||
| 2939 | subsys->name); | ||
| 2940 | mutex_unlock(&cgroup_mutex); | 2938 | mutex_unlock(&cgroup_mutex); |
| 2941 | return 0; | 2939 | return 0; |
| 2942 | } | 2940 | } |
