From 854b1faa3b2b5f61f7eae99454aa519e220dde8a Mon Sep 17 00:00:00 2001 From: Gao feng Date: Sat, 1 Dec 2012 00:21:28 +0800 Subject: [PATCH] --- yaml --- r: 339362 b: refs/heads/master c: 879a3d9dbbde823ac77d39131e7a287f31b8296f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/cgroup.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 72365429c367..17b5bfdaa25d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1f869e8711d18aaf6e2979922bc9377ad394b82f +refs/heads/master: 879a3d9dbbde823ac77d39131e7a287f31b8296f diff --git a/trunk/kernel/cgroup.c b/trunk/kernel/cgroup.c index b186a7e25b0a..e1293a9189b6 100644 --- a/trunk/kernel/cgroup.c +++ b/trunk/kernel/cgroup.c @@ -246,6 +246,8 @@ static DEFINE_SPINLOCK(hierarchy_id_lock); static int need_forkexit_callback __read_mostly; static int cgroup_destroy_locked(struct cgroup *cgrp); +static int cgroup_addrm_files(struct cgroup *cgrp, struct cgroup_subsys *subsys, + struct cftype cfts[], bool is_add); #ifdef CONFIG_PROVE_LOCKING int cgroup_lock_is_held(void) @@ -964,7 +966,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))