From bcd16ba3408a393df594346f53bd75a25f25aef0 Mon Sep 17 00:00:00 2001 From: Rami Rosen Date: Tue, 16 Apr 2013 23:24:55 +0300 Subject: [PATCH] --- yaml --- r: 365598 b: refs/heads/master c: e57d5cf2f894e3f2727f8cf74bed0bc81cae70c8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/security/device_cgroup.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 37e93975f554..3a35b687435d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f00baae7ad6c5f1503528efa852f0be8e9513f0e +refs/heads/master: e57d5cf2f894e3f2727f8cf74bed0bc81cae70c8 diff --git a/trunk/security/device_cgroup.c b/trunk/security/device_cgroup.c index 994aeccea518..dd0dc574d78d 100644 --- a/trunk/security/device_cgroup.c +++ b/trunk/security/device_cgroup.c @@ -236,7 +236,6 @@ static void devcgroup_offline(struct cgroup *cgroup) static struct cgroup_subsys_state *devcgroup_css_alloc(struct cgroup *cgroup) { struct dev_cgroup *dev_cgroup; - struct cgroup *parent_cgroup; dev_cgroup = kzalloc(sizeof(*dev_cgroup), GFP_KERNEL); if (!dev_cgroup) @@ -244,7 +243,6 @@ static struct cgroup_subsys_state *devcgroup_css_alloc(struct cgroup *cgroup) INIT_LIST_HEAD(&dev_cgroup->exceptions); INIT_LIST_HEAD(&dev_cgroup->propagate_pending); dev_cgroup->behavior = DEVCG_DEFAULT_NONE; - parent_cgroup = cgroup->parent; return &dev_cgroup->css; }