diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/cgroup.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index b186a7e25b0a..e1293a9189b6 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c | |||
@@ -246,6 +246,8 @@ static DEFINE_SPINLOCK(hierarchy_id_lock); | |||
246 | static int need_forkexit_callback __read_mostly; | 246 | static int need_forkexit_callback __read_mostly; |
247 | 247 | ||
248 | static int cgroup_destroy_locked(struct cgroup *cgrp); | 248 | static int cgroup_destroy_locked(struct cgroup *cgrp); |
249 | static int cgroup_addrm_files(struct cgroup *cgrp, struct cgroup_subsys *subsys, | ||
250 | struct cftype cfts[], bool is_add); | ||
249 | 251 | ||
250 | #ifdef CONFIG_PROVE_LOCKING | 252 | #ifdef CONFIG_PROVE_LOCKING |
251 | int cgroup_lock_is_held(void) | 253 | int cgroup_lock_is_held(void) |
@@ -964,7 +966,7 @@ static void cgroup_clear_directory(struct dentry *dir, bool base_files, | |||
964 | if (!test_bit(ss->subsys_id, &subsys_mask)) | 966 | if (!test_bit(ss->subsys_id, &subsys_mask)) |
965 | continue; | 967 | continue; |
966 | list_for_each_entry(set, &ss->cftsets, node) | 968 | list_for_each_entry(set, &ss->cftsets, node) |
967 | cgroup_rm_file(cgrp, set->cfts); | 969 | cgroup_addrm_files(cgrp, NULL, set->cfts, false); |
968 | } | 970 | } |
969 | if (base_files) { | 971 | if (base_files) { |
970 | while (!list_empty(&cgrp->files)) | 972 | while (!list_empty(&cgrp->files)) |