diff --git a/[refs] b/[refs]
index d4b17e352a8c..9f9417b6ce0b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a6d54c56326c29c5357655779cfe6cf36481b17
+refs/heads/master: cb1c4b71f6da18fa98bab4af055f391d01bee8ba
diff --git a/trunk/net/sched/cls_cgroup.c b/trunk/net/sched/cls_cgroup.c
index 91a3db4a76f8..1ab4542e61e0 100644
--- a/trunk/net/sched/cls_cgroup.c
+++ b/trunk/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;
 }