[PATCH 06/17] cgroup: remove duplicate RCU free on struct cgroup
From: Tejun Heo <hidden>
Date: 2012-11-13 03:02:30
Also in:
lkml
Subsystem:
control group (cgroup), the rest · Maintainers:
Tejun Heo, Johannes Weiner, Michal Koutný, Linus Torvalds
struct cgroup is made RCU-safe by synchronize_rcu() in cgroup_diput(). There is no reason to use RCU safe kfree on it after it. Remove cgroup->rcu_head and use kfree() instead of kfree_rcu() in cgroup_diput(). Signed-off-by: Tejun Heo <redacted> --- include/linux/cgroup.h | 3 --- kernel/cgroup.c | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index d605857..9dcbfa1 100644
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h@@ -196,9 +196,6 @@ struct cgroup { struct list_head pidlists; struct mutex pidlist_mutex; - /* For RCU-protected deletion */ - struct rcu_head rcu_head; - /* List of events which userspace want to receive */ struct list_head event_list; spinlock_t event_list_lock;
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 278752e..a91e7ad 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c@@ -893,7 +893,7 @@ static void cgroup_diput(struct dentry *dentry, struct inode *inode) simple_xattrs_free(&cgrp->xattrs); - kfree_rcu(cgrp, rcu_head); + kfree(cgrp); } else { struct cfent *cfe = __d_cfe(dentry); struct cgroup *cgrp = dentry->d_parent->d_fsdata;
--
1.7.11.7