projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'proc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan...
[linux-2.6-block.git]
/
kernel
/
cgroup.c
diff --git
a/kernel/cgroup.c
b/kernel/cgroup.c
index 5a54ff42874ee916997139c859b8cfda725b9a33..9edb5c4b79b4f1a88a0487f588c36fc6207f54a9 100644
(file)
--- a/
kernel/cgroup.c
+++ b/
kernel/cgroup.c
@@
-1122,8
+1122,8
@@
static void cgroup_kill_sb(struct super_block *sb) {
mutex_unlock(&cgroup_mutex);
mutex_unlock(&cgroup_mutex);
- kfree(root);
kill_litter_super(sb);
kill_litter_super(sb);
+ kfree(root);
}
static struct file_system_type cgroup_fs_type = {
}
static struct file_system_type cgroup_fs_type = {
@@
-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)
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);
BUG_ON(!list_empty(&init_task.tasks));
mutex_init(&ss->hierarchy_mutex);
+ lockdep_set_class(&ss->hierarchy_mutex, &ss->subsys_key);
ss->active = 1;
}
ss->active = 1;
}