projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
[cascardo/linux.git]
/
net
/
sched
/
cls_cgroup.c
diff --git
a/net/sched/cls_cgroup.c
b/net/sched/cls_cgroup.c
index
e5becb9
..
e4877ca
100644
(file)
--- a/
net/sched/cls_cgroup.c
+++ b/
net/sched/cls_cgroup.c
@@
-62,13
+62,7
@@
static u64 read_classid(struct cgroup *cgrp, struct cftype *cft)
static int write_classid(struct cgroup *cgrp, struct cftype *cft, u64 value)
{
- if (!cgroup_lock_live_group(cgrp))
- return -ENODEV;
-
cgrp_cls_state(cgrp)->classid = (u32) value;
-
- cgroup_unlock();
-
return 0;
}