projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
OOM, PM: OOM killed task shouldn't escape PM suspend
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
kernel
/
cgroup.c
diff --git
a/kernel/cgroup.c
b/kernel/cgroup.c
index
105f273
..
550e205
100644
(file)
--- a/
kernel/cgroup.c
+++ b/
kernel/cgroup.c
@@
-3663,7
+3663,6
@@
static int pidlist_array_load(struct cgroup *cgrp, enum cgroup_filetype type,
l = cgroup_pidlist_find_create(cgrp, type);
if (!l) {
l = cgroup_pidlist_find_create(cgrp, type);
if (!l) {
- mutex_unlock(&cgrp->pidlist_mutex);
pidlist_free(array);
return -ENOMEM;
}
pidlist_free(array);
return -ENOMEM;
}
@@
-4112,17
+4111,17
@@
static int create_css(struct cgroup *cgrp, struct cgroup_subsys *ss)
err = percpu_ref_init(&css->refcnt, css_release);
if (err)
err = percpu_ref_init(&css->refcnt, css_release);
if (err)
- goto err_free;
+ goto err_free
_css
;
init_css(css, ss, cgrp);
err = cgroup_populate_dir(cgrp, 1 << ss->subsys_id);
if (err)
init_css(css, ss, cgrp);
err = cgroup_populate_dir(cgrp, 1 << ss->subsys_id);
if (err)
- goto err_free;
+ goto err_free
_percpu_ref
;
err = online_css(css);
if (err)
err = online_css(css);
if (err)
- goto err_
free
;
+ goto err_
clear_dir
;
dget(cgrp->dentry);
css_get(css->parent);
dget(cgrp->dentry);
css_get(css->parent);
@@
-4138,8
+4137,11
@@
static int create_css(struct cgroup *cgrp, struct cgroup_subsys *ss)
return 0;
return 0;
-err_free:
+err_clear_dir:
+ cgroup_clear_dir(css->cgroup, 1 << css->ss->subsys_id);
+err_free_percpu_ref:
percpu_ref_cancel_init(&css->refcnt);
percpu_ref_cancel_init(&css->refcnt);
+err_free_css:
ss->css_free(css);
return err;
}
ss->css_free(css);
return err;
}