|
@@ -2351,7 +2351,7 @@ static void cgroup_lock_hierarchy(struct cgroupfs_root *root)
|
|
|
for (i = 0; i < CGROUP_SUBSYS_COUNT; i++) {
|
|
|
struct cgroup_subsys *ss = subsys[i];
|
|
|
if (ss->root == root)
|
|
|
- mutex_lock_nested(&ss->hierarchy_mutex, i);
|
|
|
+ mutex_lock(&ss->hierarchy_mutex);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -2637,6 +2637,7 @@ static void __init cgroup_init_subsys(struct cgroup_subsys *ss)
|
|
|
BUG_ON(!list_empty(&init_task.tasks));
|
|
|
|
|
|
mutex_init(&ss->hierarchy_mutex);
|
|
|
+ lockdep_set_class(&ss->hierarchy_mutex, &ss->subsys_key);
|
|
|
ss->active = 1;
|
|
|
}
|
|
|
|