diff options
Diffstat (limited to 'kernel/cgroup.c')
-rw-r--r-- | kernel/cgroup.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index 86b71e714e13..66ec9fd21e0c 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c | |||
@@ -2848,16 +2848,17 @@ void cgroup_exit(struct task_struct *tsk, int run_callbacks) | |||
2848 | * cgroup_clone - clone the cgroup the given subsystem is attached to | 2848 | * cgroup_clone - clone the cgroup the given subsystem is attached to |
2849 | * @tsk: the task to be moved | 2849 | * @tsk: the task to be moved |
2850 | * @subsys: the given subsystem | 2850 | * @subsys: the given subsystem |
2851 | * @nodename: the name for the new cgroup | ||
2851 | * | 2852 | * |
2852 | * Duplicate the current cgroup in the hierarchy that the given | 2853 | * Duplicate the current cgroup in the hierarchy that the given |
2853 | * subsystem is attached to, and move this task into the new | 2854 | * subsystem is attached to, and move this task into the new |
2854 | * child. | 2855 | * child. |
2855 | */ | 2856 | */ |
2856 | int cgroup_clone(struct task_struct *tsk, struct cgroup_subsys *subsys) | 2857 | int cgroup_clone(struct task_struct *tsk, struct cgroup_subsys *subsys, |
2858 | char *nodename) | ||
2857 | { | 2859 | { |
2858 | struct dentry *dentry; | 2860 | struct dentry *dentry; |
2859 | int ret = 0; | 2861 | int ret = 0; |
2860 | char nodename[MAX_CGROUP_TYPE_NAMELEN]; | ||
2861 | struct cgroup *parent, *child; | 2862 | struct cgroup *parent, *child; |
2862 | struct inode *inode; | 2863 | struct inode *inode; |
2863 | struct css_set *cg; | 2864 | struct css_set *cg; |
@@ -2882,8 +2883,6 @@ int cgroup_clone(struct task_struct *tsk, struct cgroup_subsys *subsys) | |||
2882 | cg = tsk->cgroups; | 2883 | cg = tsk->cgroups; |
2883 | parent = task_cgroup(tsk, subsys->subsys_id); | 2884 | parent = task_cgroup(tsk, subsys->subsys_id); |
2884 | 2885 | ||
2885 | snprintf(nodename, MAX_CGROUP_TYPE_NAMELEN, "%d", tsk->pid); | ||
2886 | |||
2887 | /* Pin the hierarchy */ | 2886 | /* Pin the hierarchy */ |
2888 | atomic_inc(&parent->root->sb->s_active); | 2887 | atomic_inc(&parent->root->sb->s_active); |
2889 | 2888 | ||