From e9cbb8553f3e23d9641f32af41e8f8d2e413be75 Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Tue, 6 Nov 2012 09:17:37 -0800 Subject: [PATCH] --- yaml --- r: 335617 b: refs/heads/master c: 201e72acb2d3821e2de9ce6091e98859c316b29a h: refs/heads/master i: 335615: fc0bd36f5857bddcad02526b1788ac81027673e2 v: v3 --- [refs] | 2 +- trunk/security/device_cgroup.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index acd52cbd7d9b..4a9a3320c6db 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 64e104771351d365e51e588a0e9a656ae6ed2f50 +refs/heads/master: 201e72acb2d3821e2de9ce6091e98859c316b29a diff --git a/trunk/security/device_cgroup.c b/trunk/security/device_cgroup.c index 96d87eab1660..b08d20c66c2e 100644 --- a/trunk/security/device_cgroup.c +++ b/trunk/security/device_cgroup.c @@ -164,8 +164,8 @@ static void dev_exception_clean(struct dev_cgroup *dev_cgroup) struct dev_exception_item *ex, *tmp; list_for_each_entry_safe(ex, tmp, &dev_cgroup->exceptions, list) { - list_del(&ex->list); - kfree(ex); + list_del_rcu(&ex->list); + kfree_rcu(ex, rcu); } } @@ -298,7 +298,7 @@ static int may_access(struct dev_cgroup *dev_cgroup, struct dev_exception_item *ex; bool match = false; - list_for_each_entry(ex, &dev_cgroup->exceptions, list) { + list_for_each_entry_rcu(ex, &dev_cgroup->exceptions, list) { if ((refex->type & DEV_BLOCK) && !(ex->type & DEV_BLOCK)) continue; if ((refex->type & DEV_CHAR) && !(ex->type & DEV_CHAR))