[PATCH 1/2] cgroup: use cgroup_addrm_files in cgroup_clear_directory
From: Gao feng <hidden>
Date: 2012-11-30 17:50:14
Also in:
lkml
Subsystem:
the rest · Maintainer:
Linus Torvalds
cgroup_rm_file only remove the first file. after remount, the cgroup subsystem will be unloaded with it's files left. use cgroup_addrm_files to remove all files of subsystem. Signed-off-by: Gao feng <redacted> --- kernel/cgroup.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index f24f724..e5233b7 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c@@ -970,6 +970,8 @@ static int cgroup_rm_file(struct cgroup *cgrp, const struct cftype *cft) return -ENOENT; } +static int cgroup_addrm_files(struct cgroup *cgrp, struct cgroup_subsys *subsys, + struct cftype cfts[], bool is_add); /** * cgroup_clear_directory - selective removal of base and subsystem files * @dir: directory containing the files
@@ -987,7 +989,7 @@ static void cgroup_clear_directory(struct dentry *dir, bool base_files, if (!test_bit(ss->subsys_id, &subsys_mask)) continue; list_for_each_entry(set, &ss->cftsets, node) - cgroup_rm_file(cgrp, set->cfts); + cgroup_addrm_files(cgrp, NULL, set->cfts, false); } if (base_files) { while (!list_empty(&cgrp->files))
--
1.7.7.6