From a9cf002ff6087852f60ff15d187cb18c4a7f3947 Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Thu, 5 Jun 2008 22:46:24 -0700 Subject: [PATCH] --- yaml --- r: 97803 b: refs/heads/master c: b66862f7663332aa1ecb3ebda4086360ddb8befc h: refs/heads/master i: 97801: aba46f3d0a22ddee9df8a3b15ad2e99861e737a0 97799: 8f9fe39fe5a9793beb0134eab30a4ffbce1ae649 v: v3 --- [refs] | 2 +- trunk/security/device_cgroup.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c2240b35b5ea..89e832013190 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 93b071139a956e51c98cdefd50a47981a4eb852e +refs/heads/master: b66862f7663332aa1ecb3ebda4086360ddb8befc diff --git a/trunk/security/device_cgroup.c b/trunk/security/device_cgroup.c index 4ea583689eec..15f2f8003ba3 100644 --- a/trunk/security/device_cgroup.c +++ b/trunk/security/device_cgroup.c @@ -49,10 +49,14 @@ struct dev_cgroup { spinlock_t lock; }; +static inline struct dev_cgroup *css_to_devcgroup(struct cgroup_subsys_state *s) +{ + return container_of(s, struct dev_cgroup, css); +} + static inline struct dev_cgroup *cgroup_to_devcgroup(struct cgroup *cgroup) { - return container_of(cgroup_subsys_state(cgroup, devices_subsys_id), - struct dev_cgroup, css); + return css_to_devcgroup(cgroup_subsys_state(cgroup, devices_subsys_id)); } struct cgroup_subsys devices_subsys;