|
@@ -1566,10 +1566,10 @@ static struct dentry *cgroup_mount(struct file_system_type *fs_type,
|
|
mutex_lock(&cgroup_mutex);
|
|
mutex_lock(&cgroup_mutex);
|
|
mutex_lock(&cgroup_root_mutex);
|
|
mutex_lock(&cgroup_root_mutex);
|
|
|
|
|
|
- root_cgrp->id = idr_alloc(&root->cgroup_idr, root_cgrp,
|
|
|
|
- 0, 1, GFP_KERNEL);
|
|
|
|
- if (root_cgrp->id < 0)
|
|
|
|
|
|
+ ret = idr_alloc(&root->cgroup_idr, root_cgrp, 0, 1, GFP_KERNEL);
|
|
|
|
+ if (ret < 0)
|
|
goto unlock_drop;
|
|
goto unlock_drop;
|
|
|
|
+ root_cgrp->id = ret;
|
|
|
|
|
|
/* Check for name clashes with existing mounts */
|
|
/* Check for name clashes with existing mounts */
|
|
ret = -EBUSY;
|
|
ret = -EBUSY;
|