cgroup: add/update accessors which obtain subsys specific data from css

[deliverable/linux.git] / security / device_cgroup.c

diff --git a/security/device_cgroup.c b/security/device_cgroup.c
index e8aad69f0d696c70b21dc8af16b0d28d990b3eda..90953648c643e02b223a42c99fe866722a6b7d42 100644 (file)
--- a/security/device_cgroup.c
+++ b/security/device_cgroup.c
@@ -53,17 +53,17 @@ struct dev_cgroup {
 
 static inline struct dev_cgroup *css_to_devcgroup(struct cgroup_subsys_state *s)
 {
-       return container_of(s, struct dev_cgroup, css);
+       return s ? container_of(s, struct dev_cgroup, css) : NULL;
 }
 
 static inline struct dev_cgroup *cgroup_to_devcgroup(struct cgroup *cgroup)
 {
-       return css_to_devcgroup(cgroup_subsys_state(cgroup, devices_subsys_id));
+       return css_to_devcgroup(cgroup_css(cgroup, devices_subsys_id));
 }
 
 static inline struct dev_cgroup *task_devcgroup(struct task_struct *task)
 {
-       return css_to_devcgroup(task_subsys_state(task, devices_subsys_id));
+       return css_to_devcgroup(task_css(task, devices_subsys_id));
 }
 
 struct cgroup_subsys devices_subsys;