Commit b17d8aeb authored by Ben Hutchings's avatar Ben Hutchings

Revert "device_cgroup: fix RCU usage"

This reverts commit c5ee5868,
which was commit 201e72ac upstream.

Herton Ronaldo Krzesinski pointed out that the race condition this
dealt with does not exist in 3.2.y.
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent 20c7bbdd
...@@ -202,8 +202,8 @@ static void devcgroup_destroy(struct cgroup_subsys *ss, ...@@ -202,8 +202,8 @@ static void devcgroup_destroy(struct cgroup_subsys *ss,
dev_cgroup = cgroup_to_devcgroup(cgroup); dev_cgroup = cgroup_to_devcgroup(cgroup);
list_for_each_entry_safe(wh, tmp, &dev_cgroup->whitelist, list) { list_for_each_entry_safe(wh, tmp, &dev_cgroup->whitelist, list) {
list_del_rcu(&wh->list); list_del(&wh->list);
kfree_rcu(wh, rcu); kfree(wh);
} }
kfree(dev_cgroup); kfree(dev_cgroup);
} }
...@@ -278,7 +278,7 @@ static int may_access_whitelist(struct dev_cgroup *c, ...@@ -278,7 +278,7 @@ static int may_access_whitelist(struct dev_cgroup *c,
{ {
struct dev_whitelist_item *whitem; struct dev_whitelist_item *whitem;
list_for_each_entry_rcu(whitem, &c->whitelist, list) { list_for_each_entry(whitem, &c->whitelist, list) {
if (whitem->type & DEV_ALL) if (whitem->type & DEV_ALL)
return 1; return 1;
if ((refwh->type & DEV_BLOCK) && !(whitem->type & DEV_BLOCK)) if ((refwh->type & DEV_BLOCK) && !(whitem->type & DEV_BLOCK))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment